mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Keep story creator around until we've verified contacts and queued job

Browse source
This commit is contained in:
Scott Nonnenberg 2022-11-01 17:36:16 -07:00 • committed by GitHub
parent 4fc1b6388c
commit 9fba33943a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 178 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

23
ts/components/Stories.tsx
View file

@ -14,9 +14,9 @@ import type {
} from '../types/Stories';
import type { LocalizerType } from '../types/Util';
import type { PreferredBadgeSelectorType } from '../state/selectors/badges';
import type { PropsType as SmartStoryCreatorPropsType } from '../state/smart/StoryCreator';
import type { ShowToastActionCreatorType } from '../state/ducks/toast';
import type {
AddStoryData,
ViewUserStoriesActionCreatorType,
ViewStoryActionCreatorType,
} from '../state/ducks/stories';
@ -27,6 +27,7 @@ import { getWidthFromPreferredWidth } from '../util/leftPaneWidth';
import { useEscapeHandling } from '../hooks/useEscapeHandling';
export type PropsType = {
addStoryData: AddStoryData;
deleteStoryForEveryone: (story: StoryViewType) => unknown;
getPreferredBadge: PreferredBadgeSelectorType;
hiddenStories: Array<ConversationStoryType>;
@ -37,7 +38,8 @@ export type PropsType = {
onSaveStory: (story: StoryViewType) => unknown;
preferredWidthFromStorage: number;
queueStoryDownload: (storyId: string) => unknown;
renderStoryCreator: (props: SmartStoryCreatorPropsType) => JSX.Element;
renderStoryCreator: () => JSX.Element;
setAddStoryData: (data: AddStoryData) => unknown;
showConversation: ShowConversationType;
showStoriesSettings: () => unknown;
showToast: ShowToastActionCreatorType;
@ -51,15 +53,8 @@ export type PropsType = {
hasViewReceiptSetting: boolean;
};
type AddStoryType =
| {
type: 'Media';
file: File;
}
| { type: 'Text' }
| undefined;
export const Stories = ({
addStoryData,
deleteStoryForEveryone,
getPreferredBadge,
hiddenStories,
@ -71,6 +66,7 @@ export const Stories = ({
preferredWidthFromStorage,
queueStoryDownload,
renderStoryCreator,
setAddStoryData,
showConversation,
showStoriesSettings,
showToast,
@ -87,7 +83,6 @@ export const Stories = ({
requiresFullWidth: true,
});
const [addStoryData, setAddStoryData] = useState<AddStoryType>();
const [isMyStories, setIsMyStories] = useState(false);
// only handle ESC if not showing a child that handles their own ESC
@ -102,11 +97,7 @@ export const Stories = ({
return (
<div className={classNames('Stories', themeClassName(Theme.Dark))}>
{addStoryData &&
renderStoryCreator({
file: addStoryData.type === 'Media' ? addStoryData.file : undefined,
onClose: () => setAddStoryData(undefined),
})}
{addStoryData && renderStoryCreator()}
<div className="Stories__pane" style={{ width }}>
{isMyStories && myStories.length ? (
<MyStories