author int64 658 755k | date stringlengths 19 19 | timezone int64 -46,800 43.2k | hash stringlengths 40 40 | message stringlengths 5 490 | mods list | language stringclasses 20 values | license stringclasses 3 values | repo stringlengths 5 68 | original_message stringlengths 12 491 |
|---|---|---|---|---|---|---|---|---|---|
129,187 | 03.05.2020 17:17:16 | 14,400 | 0056985a3eb57589e14ffcd4353a0bdece1cd928 | [native] wait_for_capture_uri_unload MediaMissionStep | [
{
"change_type": "MODIFY",
"old_path": "lib/types/media-types.js",
"new_path": "lib/types/media-types.js",
"diff": "@@ -346,6 +346,12 @@ export type MediaMissionStep =\nstep: 'processing_exception',\ntime: number, // ms\nexceptionMessage: ?string,\n+ |}\n+ | {|\n+ step: 'wait_for_capture_uri_unload',\n+ success: boolean,\n+ time: number, // ms\n+ uri: string,\n|};\nexport type MediaMissionFailure =\n@@ -637,6 +643,12 @@ export const mediaMissionPropType = PropTypes.shape({\nsuccess: PropTypes.bool.isRequired,\nexceptionMessage: PropTypes.string,\n}),\n+ PropTypes.shape({\n+ step: PropTypes.oneOf(['wait_for_capture_uri_unload']).isRequired,\n+ success: PropTypes.bool.isRequired,\n+ time: PropTypes.number.isRequired,\n+ uri: PropTypes.string.isRequired,\n+ }),\n]),\n).isRequired,\nresult: PropTypes.oneOfType([\n"
},
{
"change_type": "MODIFY",
"old_path": "native/input/input-state-container.react.js",
"new_path": "native/input/input-state-container.react.js",
"diff": "@@ -586,10 +586,15 @@ class InputStateContainer extends React.PureComponent<Props, State> {\nconst captureURI = selection.uri;\npromises.push(\n(async () => {\n- await this.onClearURI(captureURI);\n- const capturePath = pathFromURI(captureURI);\n- const removePath = capturePath ? capturePath : captureURI;\n- const disposeStep = await disposeTempFile(removePath);\n+ const {\n+ steps: clearSteps,\n+ result: capturePath,\n+ } = await this.waitForCaptureURIUnload(captureURI);\n+ steps.push(...clearSteps);\n+ if (!capturePath) {\n+ return;\n+ }\n+ const disposeStep = await disposeTempFile(capturePath);\nsteps.push(disposeStep);\n})(),\n);\n@@ -959,16 +964,45 @@ class InputStateContainer extends React.PureComponent<Props, State> {\n}\n};\n- onClearURI(uri: string) {\n+ waitForCaptureURIUnload(uri: string) {\n+ const start = Date.now();\n+ const path = pathFromURI(uri);\n+ if (!path) {\n+ return Promise.resolve({\n+ result: null,\n+ steps: [\n+ {\n+ step: 'wait_for_capture_uri_unload',\n+ success: false,\n+ time: Date.now() - start,\n+ uri,\n+ },\n+ ],\n+ });\n+ }\n+\n+ const getResult = () => ({\n+ result: path,\n+ steps: [\n+ {\n+ step: 'wait_for_capture_uri_unload',\n+ success: true,\n+ time: Date.now() - start,\n+ uri,\n+ },\n+ ],\n+ });\n+\nconst activeURI = this.activeURIs.get(uri);\n- return new Promise(resolve => {\nif (!activeURI) {\n- resolve();\n- return;\n+ return Promise.resolve(getResult());\n}\n+\n+ return new Promise(resolve => {\n+ const finish = () => resolve(getResult());\nconst newActiveURI = {\n...activeURI,\n- onClear: [...activeURI.onClear, resolve],\n+ onClear: [...activeURI.onClear, finish],\n};\nthis.activeURIs.set(uri, newActiveURI);\n});\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] wait_for_capture_uri_unload MediaMissionStep |
129,187 | 04.05.2020 11:08:48 | 14,400 | 7bbac83fe9885dd93233dd1393565db7f818d5a0 | Add possibly mutated fields to upload MediaMissionStep | [
{
"change_type": "MODIFY",
"old_path": "lib/types/media-types.js",
"new_path": "lib/types/media-types.js",
"diff": "@@ -339,8 +339,12 @@ export type MediaMissionStep =\nstep: 'upload',\nsuccess: boolean,\nexceptionMessage: ?string,\n- filename: string,\ntime: number, // ms\n+ inputFilename: string,\n+ outputMediaType: ?MediaType,\n+ outputURI: ?string,\n+ outputDimensions: ?Dimensions,\n+ outputLoop: ?boolean,\n|}\n| {|\nstep: 'processing_exception',\n@@ -635,8 +639,12 @@ export const mediaMissionPropType = PropTypes.shape({\nstep: PropTypes.oneOf(['upload']).isRequired,\nsuccess: PropTypes.bool.isRequired,\nexceptionMessage: PropTypes.string,\n- filename: PropTypes.string.isRequired,\ntime: PropTypes.number.isRequired,\n+ inputFilename: PropTypes.string.isRequired,\n+ outputMediaType: mediaTypePropType,\n+ outputURI: PropTypes.string,\n+ outputDimensions: dimensionsPropType,\n+ outputLoop: PropTypes.bool,\n}),\nPropTypes.shape({\nstep: PropTypes.oneOf(['processing_exception']).isRequired,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/input/input-state-container.react.js",
"new_path": "native/input/input-state-container.react.js",
"diff": "@@ -567,13 +567,21 @@ class InputStateContainer extends React.PureComponent<Props, State> {\nstep: 'upload',\nsuccess: !!uploadResult,\nexceptionMessage: uploadExceptionMessage,\n- filename,\ntime: Date.now() - uploadStart,\n+ inputFilename: filename,\n+ outputMediaType: uploadResult && uploadResult.mediaType,\n+ outputURI: uploadResult && uploadResult.uri,\n+ outputDimensions: uploadResult && uploadResult.dimensions,\n+ outputLoop: uploadResult && uploadResult.loop,\n});\nconst promises = [];\nif (shouldDisposePath) {\n+ // If processMedia needed to do any transcoding before upload, we dispose\n+ // of the resultant temporary file here. Since the transcoded temporary\n+ // file is only used for upload, we can dispose of it after processMedia\n+ // (reportPromise) and the upload are complete\npromises.push(\n(async () => {\nconst disposeStep = await disposeTempFile(shouldDisposePath);\n@@ -583,6 +591,12 @@ class InputStateContainer extends React.PureComponent<Props, State> {\n}\nif (selection.captureTime) {\n+ // If we are uploading a newly captured photo, we dispose of the original\n+ // file here. Note that we try to save photo captures to the camera roll\n+ // if we have permission. Even if we fail, this temporary file isn't\n+ // visible to the user, so there's no point in keeping it around. Since\n+ // the initial URI is used in rendering paths, we have to wait for it to\n+ // be replaced with the remote URI before we can dispose\nconst captureURI = selection.uri;\npromises.push(\n(async () => {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Add possibly mutated fields to upload MediaMissionStep |
129,187 | 04.05.2020 15:04:39 | 14,400 | 5e6f21a1d4a07b5205991ca37410487e10ee2175 | MediaSelection -> NativeMediaSelection | [
{
"change_type": "MODIFY",
"old_path": "lib/types/media-types.js",
"new_path": "lib/types/media-types.js",
"diff": "@@ -22,7 +22,7 @@ export type Image = {|\ntype: 'photo',\ndimensions: Dimensions,\n// stored on native only during creation in case retry needed after state lost\n- localMediaSelection?: MediaSelection,\n+ localMediaSelection?: NativeMediaSelection,\n|};\nexport type Video = {|\n@@ -32,7 +32,7 @@ export type Video = {|\ndimensions: Dimensions,\nloop?: boolean,\n// stored on native only during creation in case retry needed after state lost\n- localMediaSelection?: MediaSelection,\n+ localMediaSelection?: NativeMediaSelection,\n|};\nexport type Media = Image | Video;\n@@ -237,10 +237,10 @@ export type PhotoCapture = {|\nretries: number,\n|};\n-export type MediaSelection = MediaLibrarySelection | PhotoCapture;\n+export type NativeMediaSelection = MediaLibrarySelection | PhotoCapture;\nexport type MediaMissionStep =\n- | MediaSelection\n+ | NativeMediaSelection\n| {|\nstep: 'asset_info_fetch',\nsuccess: boolean,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/input/input-state-container.react.js",
"new_path": "native/input/input-state-container.react.js",
"diff": "@@ -8,7 +8,7 @@ import type {\nimport type {\nUploadMultimediaResult,\nMedia,\n- MediaSelection,\n+ NativeMediaSelection,\nMediaMissionResult,\nMediaMission,\n} from 'lib/types/media-types';\n@@ -78,7 +78,7 @@ function getNewLocalID() {\n}\ntype SelectionWithID = {|\n- selection: MediaSelection,\n+ selection: NativeMediaSelection,\nlocalID: string,\n|};\ntype CompletedUploads = { [localMessageID: string]: ?Set<string> };\n@@ -362,7 +362,7 @@ class InputStateContainer extends React.PureComponent<Props, State> {\nsendMultimediaMessage = async (\nthreadID: string,\n- selections: $ReadOnlyArray<MediaSelection>,\n+ selections: $ReadOnlyArray<NativeMediaSelection>,\n) => {\nthis.sendCallbacks.forEach(callback => callback());\nconst localMessageID = `local${this.props.nextLocalID}`;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/input/input-state.js",
"new_path": "native/input/input-state.js",
"diff": "// @flow\n-import type { MediaSelection } from 'lib/types/media-types';\n+import type { NativeMediaSelection } from 'lib/types/media-types';\nimport type { RawTextMessageInfo } from 'lib/types/message-types';\nimport * as React from 'react';\n@@ -37,7 +37,7 @@ export type InputState = {|\nsendTextMessage: (messageInfo: RawTextMessageInfo) => void,\nsendMultimediaMessage: (\nthreadID: string,\n- selections: $ReadOnlyArray<MediaSelection>,\n+ selections: $ReadOnlyArray<NativeMediaSelection>,\n) => Promise<void>,\nmessageHasUploadFailure: (localMessageID: string) => boolean,\nretryMultimediaMessage: (localMessageID: string) => Promise<void>,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/media/media-utils.js",
"new_path": "native/media/media-utils.js",
"diff": "@@ -5,7 +5,7 @@ import type {\nMediaType,\nMediaMissionStep,\nMediaMissionFailure,\n- MediaSelection,\n+ NativeMediaSelection,\n} from 'lib/types/media-types';\nimport { Image } from 'react-native';\n@@ -33,7 +33,7 @@ type MediaResult = {|\nloop: boolean,\n|};\nfunction processMedia(\n- selection: MediaSelection,\n+ selection: NativeMediaSelection,\nconfig: MediaProcessConfig,\n): {|\nresultPromise: Promise<MediaMissionFailure | MediaResult>,\n@@ -55,7 +55,7 @@ function processMedia(\n}\nasync function innerProcessMedia(\n- selection: MediaSelection,\n+ selection: NativeMediaSelection,\nconfig: MediaProcessConfig,\nsendResult: (result: MediaMissionFailure | MediaResult) => void,\n): Promise<$ReadOnlyArray<MediaMissionStep>> {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | MediaSelection -> NativeMediaSelection |
129,187 | 04.05.2020 15:25:54 | 14,400 | f7614a54a1e1dabab951f34f2fe1828e9b11d141 | [web] Cleanup before MediaMission | [
{
"change_type": "MODIFY",
"old_path": "web/chat/chat-input-state-container.react.js",
"new_path": "web/chat/chat-input-state-container.react.js",
"diff": "@@ -58,7 +58,6 @@ type Props = {|\n// Redux state\nactiveChatThreadID: ?string,\nviewerID: ?string,\n- nextLocalID: number,\nmessageStoreMessages: { [id: string]: RawMessageInfo },\nexifRotate: boolean,\n// Redux dispatch functions\n@@ -93,7 +92,6 @@ class ChatInputStateContainer extends React.PureComponent<Props, State> {\nsetModal: PropTypes.func.isRequired,\nactiveChatThreadID: PropTypes.string,\nviewerID: PropTypes.string,\n- nextLocalID: PropTypes.number.isRequired,\nmessageStoreMessages: PropTypes.object.isRequired,\nexifRotate: PropTypes.bool.isRequired,\ndispatchActionPayload: PropTypes.func.isRequired,\n@@ -339,7 +337,7 @@ class ChatInputStateContainer extends React.PureComponent<Props, State> {\nthis.cancelPendingUpload(threadID, localUploadID),\nsendTextMessage: (messageInfo: RawTextMessageInfo) =>\nthis.sendTextMessage(messageInfo),\n- createMultimediaMessage: (localID?: number) =>\n+ createMultimediaMessage: (localID: number) =>\nthis.createMultimediaMessage(threadID, localID),\nsetDraft: (newDraft: string) => this.setDraft(threadID, newDraft),\nmessageHasUploadFailure: (localMessageID: string) =>\n@@ -378,10 +376,6 @@ class ChatInputStateContainer extends React.PureComponent<Props, State> {\nreturn false;\n}\nconst { file, mediaType, dimensions } = result;\n- if (!dimensions) {\n- setModal(<InvalidUploadModal setModal={setModal} />);\n- return false;\n- }\nnewUploads.push({\nlocalID: `localUpload${nextLocalUploadID++}`,\nserverID: null,\n@@ -678,12 +672,8 @@ class ChatInputStateContainer extends React.PureComponent<Props, State> {\n// Creates a MultimediaMessage from the unassigned pending uploads,\n// if there are any\n- createMultimediaMessage(threadID: string, localID: ?number) {\n- const nextLocalID =\n- localID !== null && localID !== undefined\n- ? localID\n- : this.props.nextLocalID;\n- const localMessageID = `local${nextLocalID}`;\n+ createMultimediaMessage(threadID: string, localID: number) {\n+ const localMessageID = `local${localID}`;\nthis.setState(prevState => {\nconst currentPendingUploads = prevState.pendingUploads[threadID];\nif (!currentPendingUploads) {\n@@ -872,7 +862,6 @@ export default connect(\nreturn {\nactiveChatThreadID: state.navInfo.activeChatThreadID,\nviewerID: state.currentUserInfo && state.currentUserInfo.id,\n- nextLocalID: state.nextLocalID,\nmessageStoreMessages: state.messageStore.messages,\nexifRotate,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/chat-input-state.js",
"new_path": "web/chat/chat-input-state.js",
"diff": "@@ -56,7 +56,7 @@ export type ChatInputState = {|\nappendFiles: (files: $ReadOnlyArray<File>) => Promise<boolean>,\ncancelPendingUpload: (localUploadID: string) => void,\nsendTextMessage: (messageInfo: RawTextMessageInfo) => void,\n- createMultimediaMessage: (localID?: number) => void,\n+ createMultimediaMessage: (localID: number) => void,\nsetDraft: (draft: string) => void,\nmessageHasUploadFailure: (localMessageID: string) => boolean,\nretryMultimediaMessage: (localMessageID: string) => void,\n"
},
{
"change_type": "MODIFY",
"old_path": "web/utils/media-utils.js",
"new_path": "web/utils/media-utils.js",
"diff": "@@ -97,7 +97,7 @@ type FileValidationResult = {|\nfile: File,\nmediaType: MediaType,\nuri: string,\n- dimensions: ?Dimensions,\n+ dimensions: Dimensions,\n|};\nasync function validateFile(\nfile: File,\n@@ -117,12 +117,12 @@ async function validateFile(\nreturn null;\n}\n- const { dimensions, uri } = processResult;\nconst fixedFile =\nname !== file.name || mime !== file.type\n? new File([file], name, { type: mime })\n: file;\n+ const { dimensions, uri } = processResult;\nreturn { file: fixedFile, mediaType, uri, dimensions };\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [web] Cleanup before MediaMission |
129,187 | 04.05.2020 16:15:08 | 14,400 | f49b55edfdc6fed8aed1688fc7552275d7abb288 | [web] ChatInputState -> InputState | [
{
"change_type": "MODIFY",
"old_path": "web/chat/chat-input-bar.react.js",
"new_path": "web/chat/chat-input-bar.react.js",
"diff": "@@ -17,10 +17,10 @@ import {\n} from 'lib/types/thread-types';\nimport { messageTypes } from 'lib/types/message-types';\nimport {\n- chatInputStatePropType,\n- type ChatInputState,\n+ inputStatePropType,\n+ type InputState,\ntype PendingMultimediaUpload,\n-} from './chat-input-state';\n+} from '../input/input-state';\nimport * as React from 'react';\nimport invariant from 'invariant';\n@@ -43,7 +43,7 @@ import Multimedia from './multimedia.react';\ntype Props = {|\nthreadInfo: ThreadInfo,\n- chatInputState: ChatInputState,\n+ inputState: InputState,\n// Redux state\nviewerID: ?string,\njoinThreadLoadingStatus: LoadingStatus,\n@@ -58,7 +58,7 @@ type Props = {|\nclass ChatInputBar extends React.PureComponent<Props> {\nstatic propTypes = {\nthreadInfo: threadInfoPropType.isRequired,\n- chatInputState: chatInputStatePropType.isRequired,\n+ inputState: inputStatePropType.isRequired,\nviewerID: PropTypes.string,\njoinThreadLoadingStatus: loadingStatusPropType.isRequired,\ncalendarQuery: PropTypes.func.isRequired,\n@@ -75,16 +75,16 @@ class ChatInputBar extends React.PureComponent<Props> {\n}\ncomponentDidUpdate(prevProps: Props) {\n- const { chatInputState } = this.props;\n- const prevChatInputState = prevProps.chatInputState;\n- if (chatInputState.draft !== prevChatInputState.draft) {\n+ const { inputState } = this.props;\n+ const prevInputState = prevProps.inputState;\n+ if (inputState.draft !== prevInputState.draft) {\nthis.updateHeight();\n}\nconst curUploadIDs = ChatInputBar.unassignedUploadIDs(\n- chatInputState.pendingUploads,\n+ inputState.pendingUploads,\n);\nconst prevUploadIDs = ChatInputBar.unassignedUploadIDs(\n- prevChatInputState.pendingUploads,\n+ prevInputState.pendingUploads,\n);\nif (\nthis.multimediaInput &&\n@@ -153,7 +153,7 @@ class ChatInputBar extends React.PureComponent<Props> {\n);\n}\n- const { pendingUploads, cancelPendingUpload } = this.props.chatInputState;\n+ const { pendingUploads, cancelPendingUpload } = this.props.inputState;\nconst multimediaPreviews = pendingUploads.map(pendingUpload => (\n<Multimedia\nuri={pendingUpload.uri}\n@@ -174,7 +174,7 @@ class ChatInputBar extends React.PureComponent<Props> {\n<textarea\nrows=\"1\"\nplaceholder=\"Send a message...\"\n- value={this.props.chatInputState.draft}\n+ value={this.props.inputState.draft}\nonChange={this.onChangeMessageText}\nonKeyDown={this.onKeyDown}\nref={this.textareaRef}\n@@ -246,7 +246,7 @@ class ChatInputBar extends React.PureComponent<Props> {\n};\nonChangeMessageText = (event: SyntheticEvent<HTMLTextAreaElement>) => {\n- this.props.chatInputState.setDraft(event.currentTarget.value);\n+ this.props.inputState.setDraft(event.currentTarget.value);\n};\nonKeyDown = (event: SyntheticKeyboardEvent<HTMLTextAreaElement>) => {\n@@ -264,7 +264,7 @@ class ChatInputBar extends React.PureComponent<Props> {\nsend() {\nlet { nextLocalID } = this.props;\n- const text = this.props.chatInputState.draft.trim();\n+ const text = this.props.inputState.draft.trim();\nif (text) {\n// TODO we should make the send button appear dynamically\n// iff trimmed text is nonempty, just like native\n@@ -272,16 +272,16 @@ class ChatInputBar extends React.PureComponent<Props> {\nnextLocalID++;\n}\n- this.props.chatInputState.createMultimediaMessage(nextLocalID);\n+ this.props.inputState.createMultimediaMessage(nextLocalID);\n}\ndispatchTextMessageAction(text: string, nextLocalID: number) {\n- this.props.chatInputState.setDraft('');\n+ this.props.inputState.setDraft('');\nconst localID = `local${nextLocalID}`;\nconst creatorID = this.props.viewerID;\ninvariant(creatorID, 'should have viewer ID in order to send a message');\n- this.props.chatInputState.sendTextMessage({\n+ this.props.inputState.sendTextMessage({\ntype: messageTypes.TEXT,\nlocalID,\nthreadID: this.props.threadInfo.id,\n@@ -304,7 +304,7 @@ class ChatInputBar extends React.PureComponent<Props> {\nonMultimediaFileChange = async (\nevent: SyntheticInputEvent<HTMLInputElement>,\n) => {\n- const result = await this.props.chatInputState.appendFiles([\n+ const result = await this.props.inputState.appendFiles([\n...event.target.files,\n]);\nif (!result && this.multimediaInput) {\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/chat-message-list.react.js",
"new_path": "web/chat/chat-message-list.react.js",
"diff": "@@ -8,10 +8,7 @@ import {\nimport { type ThreadInfo, threadInfoPropType } from 'lib/types/thread-types';\nimport type { DispatchActionPromise } from 'lib/utils/action-utils';\nimport type { FetchMessageInfosPayload } from 'lib/types/message-types';\n-import {\n- chatInputStatePropType,\n- type ChatInputState,\n-} from './chat-input-state';\n+import { inputStatePropType, type InputState } from '../input/input-state';\nimport * as React from 'react';\nimport PropTypes from 'prop-types';\n@@ -46,7 +43,7 @@ import css from './chat-message-list.css';\ntype PassedProps = {|\nactiveChatThreadID: ?string,\n- chatInputState: ?ChatInputState,\n+ inputState: ?InputState,\nsetModal: (modal: ?React.Node) => void,\n// Redux state\nthreadInfo: ?ThreadInfo,\n@@ -79,7 +76,7 @@ type State = {|\nclass ChatMessageList extends React.PureComponent<Props, State> {\nstatic propTypes = {\nactiveChatThreadID: PropTypes.string,\n- chatInputState: chatInputStatePropType,\n+ inputState: inputStatePropType,\nsetModal: PropTypes.func.isRequired,\nthreadInfo: threadInfoPropType,\nmessageListData: PropTypes.arrayOf(chatMessageItemPropType),\n@@ -184,15 +181,15 @@ class ChatMessageList extends React.PureComponent<Props, State> {\n</div>\n);\n}\n- const { threadInfo, chatInputState, setModal } = this.props;\n- invariant(chatInputState, 'ChatInputState should be set');\n+ const { threadInfo, inputState, setModal } = this.props;\n+ invariant(inputState, 'InputState should be set');\ninvariant(threadInfo, 'ThreadInfo should be set if messageListData is');\nreturn (\n<Message\nitem={item}\nthreadInfo={threadInfo}\nsetMouseOver={this.setTimestampTooltip}\n- chatInputState={chatInputState}\n+ inputState={inputState}\nsetModal={setModal}\ntimeZone={this.props.timeZone}\nkey={ChatMessageList.keyExtractor(item)}\n@@ -230,7 +227,7 @@ class ChatMessageList extends React.PureComponent<Props, State> {\nconst {\nmessageListData,\nthreadInfo,\n- chatInputState,\n+ inputState,\nconnectDropTarget,\nisActive,\n} = this.props;\n@@ -238,7 +235,7 @@ class ChatMessageList extends React.PureComponent<Props, State> {\nreturn <div className={css.container} />;\n}\ninvariant(threadInfo, 'ThreadInfo should be set if messageListData is');\n- invariant(chatInputState, 'ChatInputState should be set');\n+ invariant(inputState, 'InputState should be set');\nconst messages = messageListData.map(this.renderItem);\nconst containerStyle = classNames({\n[css.container]: true,\n@@ -262,7 +259,7 @@ class ChatMessageList extends React.PureComponent<Props, State> {\n{messages}\n{tooltip}\n</div>\n- <ChatInputBar threadInfo={threadInfo} chatInputState={chatInputState} />\n+ <ChatInputBar threadInfo={threadInfo} inputState={inputState} />\n</div>,\n);\n}\n@@ -275,8 +272,8 @@ class ChatMessageList extends React.PureComponent<Props, State> {\n};\nonPaste = (e: ClipboardEvent) => {\n- const { chatInputState } = this.props;\n- if (!chatInputState) {\n+ const { inputState } = this.props;\n+ if (!inputState) {\nreturn;\n}\nconst { clipboardData } = e;\n@@ -288,7 +285,7 @@ class ChatMessageList extends React.PureComponent<Props, State> {\nreturn;\n}\ne.preventDefault();\n- chatInputState.appendFiles([...files]);\n+ inputState.appendFiles([...files]);\n};\nmessageContainerRef = (messageContainer: ?HTMLDivElement) => {\n@@ -372,8 +369,8 @@ export default DropTarget(\n{\ndrop: (props: PassedProps, monitor) => {\nconst { files } = monitor.getItem();\n- if (props.chatInputState && files.length > 0) {\n- props.chatInputState.appendFiles(files);\n+ if (props.inputState && files.length > 0) {\n+ props.inputState.appendFiles(files);\n}\n},\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/chat.react.js",
"new_path": "web/chat/chat.react.js",
"diff": "@@ -4,7 +4,7 @@ import * as React from 'react';\nimport PropTypes from 'prop-types';\nimport ChatThreadList from './chat-thread-list.react';\n-import ChatInputStateContainer from './chat-input-state-container.react';\n+import InputStateContainer from '../input/input-state-container.react';\ntype Props = {|\nsetModal: (modal: ?React.Node) => void,\n@@ -18,7 +18,7 @@ class Chat extends React.PureComponent<Props> {\nreturn (\n<React.Fragment>\n<ChatThreadList />\n- <ChatInputStateContainer setModal={this.props.setModal} />\n+ <InputStateContainer setModal={this.props.setModal} />\n</React.Fragment>\n);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/composed-message.react.js",
"new_path": "web/chat/composed-message.react.js",
"diff": "@@ -7,10 +7,7 @@ import {\nimport { type ThreadInfo, threadInfoPropType } from 'lib/types/thread-types';\nimport { assertComposableMessageType } from 'lib/types/message-types';\nimport type { MessagePositionInfo } from './message.react';\n-import {\n- chatInputStatePropType,\n- type ChatInputState,\n-} from './chat-input-state';\n+import { inputStatePropType, type InputState } from '../input/input-state';\nimport * as React from 'react';\nimport PropTypes from 'prop-types';\n@@ -34,7 +31,7 @@ type Props = {|\nchildren: React.Node,\nclassName?: ?string,\nborderRadius: number,\n- chatInputState: ChatInputState,\n+ inputState: InputState,\n|};\nclass ComposedMessage extends React.PureComponent<Props> {\nstatic propTypes = {\n@@ -45,7 +42,7 @@ class ComposedMessage extends React.PureComponent<Props> {\nchildren: PropTypes.node.isRequired,\nclassName: PropTypes.string,\nborderRadius: PropTypes.number.isRequired,\n- chatInputState: chatInputStatePropType.isRequired,\n+ inputState: inputStatePropType.isRequired,\n};\nstatic defaultProps = {\nborderRadius: 8,\n@@ -53,7 +50,7 @@ class ComposedMessage extends React.PureComponent<Props> {\nrender() {\nassertComposableMessageType(this.props.item.messageInfo.type);\n- const { borderRadius, item, threadInfo, chatInputState } = this.props;\n+ const { borderRadius, item, threadInfo, inputState } = this.props;\nconst { id, creator } = item.messageInfo;\nconst threadColor = threadInfo.color;\n@@ -91,7 +88,7 @@ class ComposedMessage extends React.PureComponent<Props> {\n<FailedSend\nitem={item}\nthreadInfo={threadInfo}\n- chatInputState={chatInputState}\n+ inputState={inputState}\n/>\n);\n} else {\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/failed-send.react.js",
"new_path": "web/chat/failed-send.react.js",
"diff": "@@ -11,10 +11,7 @@ import {\n} from 'lib/types/message-types';\nimport { type ThreadInfo, threadInfoPropType } from 'lib/types/thread-types';\nimport type { AppState } from '../redux-setup';\n-import {\n- chatInputStatePropType,\n- type ChatInputState,\n-} from './chat-input-state';\n+import { inputStatePropType, type InputState } from '../input/input-state';\nimport * as React from 'react';\nimport invariant from 'invariant';\n@@ -30,7 +27,7 @@ import textMessageSendFailed from './text-message-send-failed';\ntype Props = {|\nitem: ChatMessageInfoItem,\nthreadInfo: ThreadInfo,\n- chatInputState: ChatInputState,\n+ inputState: InputState,\n// Redux state\nrawMessageInfo: RawComposableMessageInfo,\n|};\n@@ -38,7 +35,7 @@ class FailedSend extends React.PureComponent<Props> {\nstatic propTypes = {\nitem: chatMessageItemPropType.isRequired,\nthreadInfo: threadInfoPropType.isRequired,\n- chatInputState: chatInputStatePropType.isRequired,\n+ inputState: inputStatePropType.isRequired,\nrawMessageInfo: PropTypes.object.isRequired,\n};\nretryingText = false;\n@@ -53,11 +50,11 @@ class FailedSend extends React.PureComponent<Props> {\n) {\nconst isFailed = multimediaMessageSendFailed(\nthis.props.item,\n- this.props.chatInputState,\n+ this.props.inputState,\n);\nconst wasFailed = multimediaMessageSendFailed(\nprevProps.item,\n- prevProps.chatInputState,\n+ prevProps.inputState,\n);\nconst isDone =\nthis.props.item.messageInfo.id !== null &&\n@@ -106,7 +103,7 @@ class FailedSend extends React.PureComponent<Props> {\nreturn;\n}\nthis.retryingText = true;\n- this.props.chatInputState.sendTextMessage({\n+ this.props.inputState.sendTextMessage({\n...rawMessageInfo,\ntime: Date.now(),\n});\n@@ -120,7 +117,7 @@ class FailedSend extends React.PureComponent<Props> {\nreturn;\n}\nthis.retryingMedia = true;\n- this.props.chatInputState.retryMultimediaMessage(localID);\n+ this.props.inputState.retryMultimediaMessage(localID);\n}\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/message.react.js",
"new_path": "web/chat/message.react.js",
"diff": "@@ -6,10 +6,7 @@ import {\n} from 'lib/selectors/chat-selectors';\nimport { messageTypes } from 'lib/types/message-types';\nimport { type ThreadInfo, threadInfoPropType } from 'lib/types/thread-types';\n-import {\n- chatInputStatePropType,\n- type ChatInputState,\n-} from './chat-input-state';\n+import { inputStatePropType, type InputState } from '../input/input-state';\nimport * as React from 'react';\nimport PropTypes from 'prop-types';\n@@ -44,7 +41,7 @@ type Props = {|\nitem: ChatMessageInfoItem,\nthreadInfo: ThreadInfo,\nsetMouseOver: (messagePositionInfo: MessagePositionInfo) => void,\n- chatInputState: ChatInputState,\n+ inputState: InputState,\nsetModal: (modal: ?React.Node) => void,\ntimeZone: ?string,\n|};\n@@ -53,7 +50,7 @@ class Message extends React.PureComponent<Props> {\nitem: chatMessageItemPropType.isRequired,\nthreadInfo: threadInfoPropType.isRequired,\nsetMouseOver: PropTypes.func.isRequired,\n- chatInputState: chatInputStatePropType.isRequired,\n+ inputState: inputStatePropType.isRequired,\nsetModal: PropTypes.func.isRequired,\ntimeZone: PropTypes.string,\n};\n@@ -76,7 +73,7 @@ class Message extends React.PureComponent<Props> {\nitem={item}\nthreadInfo={this.props.threadInfo}\nsetMouseOver={this.props.setMouseOver}\n- chatInputState={this.props.chatInputState}\n+ inputState={this.props.inputState}\n/>\n);\n} else if (\n@@ -88,7 +85,7 @@ class Message extends React.PureComponent<Props> {\nitem={item}\nthreadInfo={this.props.threadInfo}\nsetMouseOver={this.props.setMouseOver}\n- chatInputState={this.props.chatInputState}\n+ inputState={this.props.inputState}\nsetModal={this.props.setModal}\n/>\n);\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/multimedia-message-send-failed.js",
"new_path": "web/chat/multimedia-message-send-failed.js",
"diff": "import type { ChatMessageInfoItem } from 'lib/selectors/chat-selectors';\nimport { messageTypes } from 'lib/types/message-types';\n-import type { ChatInputState } from './chat-input-state';\n+import type { InputState } from '../input/input-state';\nimport invariant from 'invariant';\nexport default function multimediaMessageSendFailed(\nitem: ChatMessageInfoItem,\n- chatInputState: ChatInputState,\n+ inputState: InputState,\n) {\nconst { messageInfo } = item;\nif (\n@@ -24,7 +24,7 @@ export default function multimediaMessageSendFailed(\n}\ninvariant(localID, 'localID should be set if serverID is not');\nreturn !!(\n- chatInputState.messageHasUploadFailure(localID) ||\n+ inputState.messageHasUploadFailure(localID) ||\n(item.localMessageInfo && item.localMessageInfo.sendFailed)\n);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/multimedia-message.react.js",
"new_path": "web/chat/multimedia-message.react.js",
"diff": "@@ -5,10 +5,7 @@ import {\nchatMessageItemPropType,\n} from 'lib/selectors/chat-selectors';\nimport { messageTypes } from 'lib/types/message-types';\n-import {\n- chatInputStatePropType,\n- type ChatInputState,\n-} from './chat-input-state';\n+import { inputStatePropType, type InputState } from '../input/input-state';\nimport type { MessagePositionInfo } from './message.react';\nimport { type ThreadInfo, threadInfoPropType } from 'lib/types/thread-types';\n@@ -25,7 +22,7 @@ type Props = {|\nitem: ChatMessageInfoItem,\nthreadInfo: ThreadInfo,\nsetMouseOver: (messagePositionInfo: MessagePositionInfo) => void,\n- chatInputState: ChatInputState,\n+ inputState: InputState,\nsetModal: (modal: ?React.Node) => void,\n|};\nclass MultimediaMessage extends React.PureComponent<Props> {\n@@ -33,7 +30,7 @@ class MultimediaMessage extends React.PureComponent<Props> {\nitem: chatMessageItemPropType.isRequired,\nthreadInfo: threadInfoPropType.isRequired,\nsetMouseOver: PropTypes.func.isRequired,\n- chatInputState: chatInputStatePropType.isRequired,\n+ inputState: inputStatePropType.isRequired,\nsetModal: PropTypes.func.isRequired,\n};\n@@ -47,7 +44,7 @@ class MultimediaMessage extends React.PureComponent<Props> {\nconst { localID, media } = item.messageInfo;\nconst pendingUploads = localID\n- ? this.props.chatInputState.assignedUploads[localID]\n+ ? this.props.inputState.assignedUploads[localID]\n: null;\nconst multimedia = [];\nfor (let singleMedia of media) {\n@@ -77,11 +74,11 @@ class MultimediaMessage extends React.PureComponent<Props> {\n<ComposedMessage\nitem={item}\nthreadInfo={this.props.threadInfo}\n- sendFailed={sendFailed(this.props.item, this.props.chatInputState)}\n+ sendFailed={sendFailed(this.props.item, this.props.inputState)}\nsetMouseOver={this.props.setMouseOver}\nclassName={className}\nborderRadius={16}\n- chatInputState={this.props.chatInputState}\n+ inputState={this.props.inputState}\n>\n{content}\n</ComposedMessage>\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/multimedia.react.js",
"new_path": "web/chat/multimedia.react.js",
"diff": "import {\ntype PendingMultimediaUpload,\npendingMultimediaUploadPropType,\n-} from './chat-input-state';\n+} from '../input/input-state';\nimport * as React from 'react';\nimport PropTypes from 'prop-types';\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/text-message.react.js",
"new_path": "web/chat/text-message.react.js",
"diff": "@@ -7,10 +7,7 @@ import {\nimport { messageTypes } from 'lib/types/message-types';\nimport { type ThreadInfo, threadInfoPropType } from 'lib/types/thread-types';\nimport type { MessagePositionInfo } from './message.react';\n-import {\n- chatInputStatePropType,\n- type ChatInputState,\n-} from './chat-input-state';\n+import { inputStatePropType, type InputState } from '../input/input-state';\nimport * as React from 'react';\nimport invariant from 'invariant';\n@@ -29,14 +26,14 @@ type Props = {|\nitem: ChatMessageInfoItem,\nthreadInfo: ThreadInfo,\nsetMouseOver: (messagePositionInfo: MessagePositionInfo) => void,\n- chatInputState: ChatInputState,\n+ inputState: InputState,\n|};\nclass TextMessage extends React.PureComponent<Props> {\nstatic propTypes = {\nitem: chatMessageItemPropType.isRequired,\nthreadInfo: threadInfoPropType.isRequired,\nsetMouseOver: PropTypes.func.isRequired,\n- chatInputState: chatInputStatePropType.isRequired,\n+ inputState: inputStatePropType.isRequired,\n};\nconstructor(props: Props) {\n@@ -88,7 +85,7 @@ class TextMessage extends React.PureComponent<Props> {\nthreadInfo={this.props.threadInfo}\nsendFailed={textMessageSendFailed(this.props.item)}\nsetMouseOver={this.props.setMouseOver}\n- chatInputState={this.props.chatInputState}\n+ inputState={this.props.inputState}\n>\n<div className={messageClassName} style={messageStyle}>\n<Linkify>{text}</Linkify>\n"
},
{
"change_type": "RENAME",
"old_path": "web/chat/chat-input-state-container.react.js",
"new_path": "web/input/input-state-container.react.js",
"diff": "@@ -6,7 +6,7 @@ import type {\nDispatchActionPayload,\nDispatchActionPromise,\n} from 'lib/utils/action-utils';\n-import type { PendingMultimediaUpload } from './chat-input-state';\n+import type { PendingMultimediaUpload } from './input-state';\nimport {\nmessageTypes,\ntype RawMessageInfo,\n@@ -47,7 +47,7 @@ import {\n} from 'lib/actions/message-actions';\nimport { createMediaMessageInfo } from 'lib/shared/message-utils';\n-import ChatMessageList from './chat-message-list.react';\n+import ChatMessageList from '../chat/chat-message-list.react';\nimport { validateFile, preloadImage } from '../utils/media-utils';\nimport InvalidUploadModal from '../modals/chat/invalid-upload.react';\n@@ -87,7 +87,7 @@ type State = {|\n},\ndrafts: { [threadID: string]: string },\n|};\n-class ChatInputStateContainer extends React.PureComponent<Props, State> {\n+class InputStateContainer extends React.PureComponent<Props, State> {\nstatic propTypes = {\nsetModal: PropTypes.func.isRequired,\nactiveChatThreadID: PropTypes.string,\n@@ -207,10 +207,10 @@ class ChatInputStateContainer extends React.PureComponent<Props, State> {\nnewMessageInfos.set(messageID, messageInfo);\n}\n- const currentlyCompleted = ChatInputStateContainer.completedMessageIDs(\n+ const currentlyCompleted = InputStateContainer.completedMessageIDs(\nthis.state,\n);\n- const previouslyCompleted = ChatInputStateContainer.completedMessageIDs(\n+ const previouslyCompleted = InputStateContainer.completedMessageIDs(\nprevState,\n);\nfor (let messageID of currentlyCompleted) {\n@@ -308,7 +308,7 @@ class ChatInputStateContainer extends React.PureComponent<Props, State> {\n}\n}\n- chatInputStateSelector = _memoize((threadID: string) =>\n+ inputStateSelector = _memoize((threadID: string) =>\ncreateSelector(\n(state: State) => state.pendingUploads[threadID],\n(state: State) => state.drafts[threadID],\n@@ -774,7 +774,7 @@ class ChatInputStateContainer extends React.PureComponent<Props, State> {\n}: RawImagesMessageInfo);\n}\n- const completed = ChatInputStateContainer.completedMessageIDs(this.state);\n+ const completed = InputStateContainer.completedMessageIDs(this.state);\nif (completed.has(localMessageID)) {\nthis.sendMultimediaMessage(newRawMessageInfo);\nreturn;\n@@ -842,13 +842,13 @@ class ChatInputStateContainer extends React.PureComponent<Props, State> {\nrender() {\nconst { activeChatThreadID, setModal } = this.props;\n- const chatInputState = activeChatThreadID\n- ? this.chatInputStateSelector(activeChatThreadID)(this.state)\n+ const inputState = activeChatThreadID\n+ ? this.inputStateSelector(activeChatThreadID)(this.state)\n: null;\nreturn (\n<ChatMessageList\nactiveChatThreadID={activeChatThreadID}\n- chatInputState={chatInputState}\n+ inputState={inputState}\nsetModal={setModal}\n/>\n);\n@@ -867,4 +867,4 @@ export default connect(\n};\n},\n{ uploadMultimedia, deleteUpload, sendMultimediaMessage, sendTextMessage },\n-)(ChatInputStateContainer);\n+)(InputStateContainer);\n"
},
{
"change_type": "RENAME",
"old_path": "web/chat/chat-input-state.js",
"new_path": "web/input/input-state.js",
"diff": "@@ -47,7 +47,7 @@ export const pendingMultimediaUploadPropType = PropTypes.shape({\n});\n// This type represents the input state for a particular thread\n-export type ChatInputState = {|\n+export type InputState = {|\npendingUploads: $ReadOnlyArray<PendingMultimediaUpload>,\nassignedUploads: {\n[messageID: string]: $ReadOnlyArray<PendingMultimediaUpload>,\n@@ -64,7 +64,7 @@ export type ChatInputState = {|\nconst arrayOfUploadsPropType = PropTypes.arrayOf(\npendingMultimediaUploadPropType,\n);\n-export const chatInputStatePropType = PropTypes.shape({\n+export const inputStatePropType = PropTypes.shape({\npendingUploads: arrayOfUploadsPropType.isRequired,\nassignedUploads: PropTypes.objectOf(arrayOfUploadsPropType).isRequired,\ndraft: PropTypes.string.isRequired,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [web] ChatInputState -> InputState |
129,187 | 04.05.2020 18:11:47 | 14,400 | ab79b7c6e455a5db0860959071e27fd67f924fc2 | [web] InputStateContext | [
{
"change_type": "MODIFY",
"old_path": "web/chat/chat-message-list.react.js",
"new_path": "web/chat/chat-message-list.react.js",
"diff": "@@ -8,7 +8,6 @@ import {\nimport { type ThreadInfo, threadInfoPropType } from 'lib/types/thread-types';\nimport type { DispatchActionPromise } from 'lib/utils/action-utils';\nimport type { FetchMessageInfosPayload } from 'lib/types/message-types';\n-import { inputStatePropType, type InputState } from '../input/input-state';\nimport * as React from 'react';\nimport PropTypes from 'prop-types';\n@@ -39,13 +38,17 @@ import Message, {\n} from './message.react';\nimport LoadingIndicator from '../loading-indicator.react';\nimport MessageTimestampTooltip from './message-timestamp-tooltip.react';\n+import {\n+ inputStatePropType,\n+ type InputState,\n+ withInputState,\n+} from '../input/input-state';\nimport css from './chat-message-list.css';\ntype PassedProps = {|\n- activeChatThreadID: ?string,\n- inputState: ?InputState,\nsetModal: (modal: ?React.Node) => void,\n// Redux state\n+ activeChatThreadID: ?string,\nthreadInfo: ?ThreadInfo,\nmessageListData: ?$ReadOnlyArray<ChatMessageItem>,\nstartReached: boolean,\n@@ -61,6 +64,8 @@ type PassedProps = {|\nfetchMostRecentMessages: (\nthreadID: string,\n) => Promise<FetchMessageInfosPayload>,\n+ // withInputState\n+ inputState: ?InputState,\n|};\ntype ReactDnDProps = {|\nisActive: boolean,\n@@ -75,9 +80,8 @@ type State = {|\n|};\nclass ChatMessageList extends React.PureComponent<Props, State> {\nstatic propTypes = {\n- activeChatThreadID: PropTypes.string,\n- inputState: inputStatePropType,\nsetModal: PropTypes.func.isRequired,\n+ activeChatThreadID: PropTypes.string,\nthreadInfo: threadInfoPropType,\nmessageListData: PropTypes.arrayOf(chatMessageItemPropType),\nstartReached: PropTypes.bool.isRequired,\n@@ -86,6 +90,7 @@ class ChatMessageList extends React.PureComponent<Props, State> {\ndispatchActionPromise: PropTypes.func.isRequired,\nfetchMessagesBeforeCursor: PropTypes.func.isRequired,\nfetchMostRecentMessages: PropTypes.func.isRequired,\n+ inputState: inputStatePropType,\n};\nstate = {\nmessageMouseover: null,\n@@ -181,15 +186,13 @@ class ChatMessageList extends React.PureComponent<Props, State> {\n</div>\n);\n}\n- const { threadInfo, inputState, setModal } = this.props;\n- invariant(inputState, 'InputState should be set');\n+ const { threadInfo, setModal } = this.props;\ninvariant(threadInfo, 'ThreadInfo should be set if messageListData is');\nreturn (\n<Message\nitem={item}\nthreadInfo={threadInfo}\nsetMouseOver={this.setTimestampTooltip}\n- inputState={inputState}\nsetModal={setModal}\ntimeZone={this.props.timeZone}\nkey={ChatMessageList.keyExtractor(item)}\n@@ -344,11 +347,12 @@ registerFetchKey(fetchMessagesBeforeCursorActionTypes);\nregisterFetchKey(fetchMostRecentMessagesActionTypes);\nconst ReduxConnectedChatMessageList = connect(\n- (state: AppState, ownProps: { activeChatThreadID: ?string }) => {\n- const { activeChatThreadID } = ownProps;\n+ (state: AppState) => {\n+ const { activeChatThreadID } = state.navInfo;\nconst browser = detectBrowser(state.userAgent);\nconst firefox = browser && browser.name === 'firefox';\nreturn {\n+ activeChatThreadID,\nthreadInfo: activeChatThreadID\n? threadInfoSelector(state)[activeChatThreadID]\n: null,\n@@ -364,7 +368,8 @@ const ReduxConnectedChatMessageList = connect(\n{ fetchMessagesBeforeCursor, fetchMostRecentMessages },\n)(ChatMessageList);\n-export default DropTarget(\n+export default withInputState(\n+ DropTarget(\nNativeTypes.FILE,\n{\ndrop: (props: PassedProps, monitor) => {\n@@ -378,4 +383,5 @@ export default DropTarget(\nconnectDropTarget: connector.dropTarget(),\nisActive: monitor.isOver() && monitor.canDrop(),\n}),\n-)(ReduxConnectedChatMessageList);\n+ )(ReduxConnectedChatMessageList),\n+);\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/chat.react.js",
"new_path": "web/chat/chat.react.js",
"diff": "@@ -4,6 +4,7 @@ import * as React from 'react';\nimport PropTypes from 'prop-types';\nimport ChatThreadList from './chat-thread-list.react';\n+import ChatMessageList from './chat-message-list.react';\nimport InputStateContainer from '../input/input-state-container.react';\ntype Props = {|\n@@ -16,10 +17,12 @@ class Chat extends React.PureComponent<Props> {\nrender() {\nreturn (\n- <React.Fragment>\n+ <>\n<ChatThreadList />\n- <InputStateContainer setModal={this.props.setModal} />\n- </React.Fragment>\n+ <InputStateContainer setModal={this.props.setModal}>\n+ <ChatMessageList setModal={this.props.setModal} />\n+ </InputStateContainer>\n+ </>\n);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/composed-message.react.js",
"new_path": "web/chat/composed-message.react.js",
"diff": "@@ -7,7 +7,6 @@ import {\nimport { type ThreadInfo, threadInfoPropType } from 'lib/types/thread-types';\nimport { assertComposableMessageType } from 'lib/types/message-types';\nimport type { MessagePositionInfo } from './message.react';\n-import { inputStatePropType, type InputState } from '../input/input-state';\nimport * as React from 'react';\nimport PropTypes from 'prop-types';\n@@ -31,7 +30,6 @@ type Props = {|\nchildren: React.Node,\nclassName?: ?string,\nborderRadius: number,\n- inputState: InputState,\n|};\nclass ComposedMessage extends React.PureComponent<Props> {\nstatic propTypes = {\n@@ -42,7 +40,6 @@ class ComposedMessage extends React.PureComponent<Props> {\nchildren: PropTypes.node.isRequired,\nclassName: PropTypes.string,\nborderRadius: PropTypes.number.isRequired,\n- inputState: inputStatePropType.isRequired,\n};\nstatic defaultProps = {\nborderRadius: 8,\n@@ -50,7 +47,7 @@ class ComposedMessage extends React.PureComponent<Props> {\nrender() {\nassertComposableMessageType(this.props.item.messageInfo.type);\n- const { borderRadius, item, threadInfo, inputState } = this.props;\n+ const { borderRadius, item, threadInfo } = this.props;\nconst { id, creator } = item.messageInfo;\nconst threadColor = threadInfo.color;\n@@ -84,13 +81,7 @@ class ComposedMessage extends React.PureComponent<Props> {\n} else if (this.props.sendFailed) {\ndeliveryIconSpan = <XCircleIcon />;\ndeliveryIconColor = 'FF0000';\n- failedSendInfo = (\n- <FailedSend\n- item={item}\n- threadInfo={threadInfo}\n- inputState={inputState}\n- />\n- );\n+ failedSendInfo = <FailedSend item={item} threadInfo={threadInfo} />;\n} else {\ndeliveryIconSpan = <CircleIcon />;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/failed-send.react.js",
"new_path": "web/chat/failed-send.react.js",
"diff": "@@ -11,7 +11,6 @@ import {\n} from 'lib/types/message-types';\nimport { type ThreadInfo, threadInfoPropType } from 'lib/types/thread-types';\nimport type { AppState } from '../redux-setup';\n-import { inputStatePropType, type InputState } from '../input/input-state';\nimport * as React from 'react';\nimport invariant from 'invariant';\n@@ -23,20 +22,26 @@ import { connect } from 'lib/utils/redux-utils';\nimport css from './chat-message-list.css';\nimport multimediaMessageSendFailed from './multimedia-message-send-failed';\nimport textMessageSendFailed from './text-message-send-failed';\n+import {\n+ inputStatePropType,\n+ type InputState,\n+ withInputState,\n+} from '../input/input-state';\ntype Props = {|\nitem: ChatMessageInfoItem,\nthreadInfo: ThreadInfo,\n- inputState: InputState,\n// Redux state\nrawMessageInfo: RawComposableMessageInfo,\n+ // withInputState\n+ inputState: InputState,\n|};\nclass FailedSend extends React.PureComponent<Props> {\nstatic propTypes = {\nitem: chatMessageItemPropType.isRequired,\nthreadInfo: threadInfoPropType.isRequired,\n- inputState: inputStatePropType.isRequired,\nrawMessageInfo: PropTypes.object.isRequired,\n+ inputState: inputStatePropType.isRequired,\n};\nretryingText = false;\nretryingMedia = false;\n@@ -137,4 +142,4 @@ export default connect(\n);\nreturn { rawMessageInfo };\n},\n-)(FailedSend);\n+)(withInputState(FailedSend));\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/message.react.js",
"new_path": "web/chat/message.react.js",
"diff": "@@ -6,7 +6,6 @@ import {\n} from 'lib/selectors/chat-selectors';\nimport { messageTypes } from 'lib/types/message-types';\nimport { type ThreadInfo, threadInfoPropType } from 'lib/types/thread-types';\n-import { inputStatePropType, type InputState } from '../input/input-state';\nimport * as React from 'react';\nimport PropTypes from 'prop-types';\n@@ -41,7 +40,6 @@ type Props = {|\nitem: ChatMessageInfoItem,\nthreadInfo: ThreadInfo,\nsetMouseOver: (messagePositionInfo: MessagePositionInfo) => void,\n- inputState: InputState,\nsetModal: (modal: ?React.Node) => void,\ntimeZone: ?string,\n|};\n@@ -50,7 +48,6 @@ class Message extends React.PureComponent<Props> {\nitem: chatMessageItemPropType.isRequired,\nthreadInfo: threadInfoPropType.isRequired,\nsetMouseOver: PropTypes.func.isRequired,\n- inputState: inputStatePropType.isRequired,\nsetModal: PropTypes.func.isRequired,\ntimeZone: PropTypes.string,\n};\n@@ -73,7 +70,6 @@ class Message extends React.PureComponent<Props> {\nitem={item}\nthreadInfo={this.props.threadInfo}\nsetMouseOver={this.props.setMouseOver}\n- inputState={this.props.inputState}\n/>\n);\n} else if (\n@@ -85,7 +81,6 @@ class Message extends React.PureComponent<Props> {\nitem={item}\nthreadInfo={this.props.threadInfo}\nsetMouseOver={this.props.setMouseOver}\n- inputState={this.props.inputState}\nsetModal={this.props.setModal}\n/>\n);\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/multimedia-message.react.js",
"new_path": "web/chat/multimedia-message.react.js",
"diff": "@@ -5,7 +5,6 @@ import {\nchatMessageItemPropType,\n} from 'lib/selectors/chat-selectors';\nimport { messageTypes } from 'lib/types/message-types';\n-import { inputStatePropType, type InputState } from '../input/input-state';\nimport type { MessagePositionInfo } from './message.react';\nimport { type ThreadInfo, threadInfoPropType } from 'lib/types/thread-types';\n@@ -17,21 +16,27 @@ import css from './chat-message-list.css';\nimport Multimedia from './multimedia.react';\nimport ComposedMessage from './composed-message.react';\nimport sendFailed from './multimedia-message-send-failed';\n+import {\n+ inputStatePropType,\n+ type InputState,\n+ withInputState,\n+} from '../input/input-state';\ntype Props = {|\nitem: ChatMessageInfoItem,\nthreadInfo: ThreadInfo,\nsetMouseOver: (messagePositionInfo: MessagePositionInfo) => void,\n- inputState: InputState,\nsetModal: (modal: ?React.Node) => void,\n+ // withInputState\n+ inputState: InputState,\n|};\nclass MultimediaMessage extends React.PureComponent<Props> {\nstatic propTypes = {\nitem: chatMessageItemPropType.isRequired,\nthreadInfo: threadInfoPropType.isRequired,\nsetMouseOver: PropTypes.func.isRequired,\n- inputState: inputStatePropType.isRequired,\nsetModal: PropTypes.func.isRequired,\n+ inputState: inputStatePropType.isRequired,\n};\nrender() {\n@@ -78,7 +83,6 @@ class MultimediaMessage extends React.PureComponent<Props> {\nsetMouseOver={this.props.setMouseOver}\nclassName={className}\nborderRadius={16}\n- inputState={this.props.inputState}\n>\n{content}\n</ComposedMessage>\n@@ -86,4 +90,4 @@ class MultimediaMessage extends React.PureComponent<Props> {\n}\n}\n-export default MultimediaMessage;\n+export default withInputState(MultimediaMessage);\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/text-message.react.js",
"new_path": "web/chat/text-message.react.js",
"diff": "@@ -7,7 +7,6 @@ import {\nimport { messageTypes } from 'lib/types/message-types';\nimport { type ThreadInfo, threadInfoPropType } from 'lib/types/thread-types';\nimport type { MessagePositionInfo } from './message.react';\n-import { inputStatePropType, type InputState } from '../input/input-state';\nimport * as React from 'react';\nimport invariant from 'invariant';\n@@ -26,14 +25,12 @@ type Props = {|\nitem: ChatMessageInfoItem,\nthreadInfo: ThreadInfo,\nsetMouseOver: (messagePositionInfo: MessagePositionInfo) => void,\n- inputState: InputState,\n|};\nclass TextMessage extends React.PureComponent<Props> {\nstatic propTypes = {\nitem: chatMessageItemPropType.isRequired,\nthreadInfo: threadInfoPropType.isRequired,\nsetMouseOver: PropTypes.func.isRequired,\n- inputState: inputStatePropType.isRequired,\n};\nconstructor(props: Props) {\n@@ -85,7 +82,6 @@ class TextMessage extends React.PureComponent<Props> {\nthreadInfo={this.props.threadInfo}\nsendFailed={textMessageSendFailed(this.props.item)}\nsetMouseOver={this.props.setMouseOver}\n- inputState={this.props.inputState}\n>\n<div className={messageClassName} style={messageStyle}>\n<Linkify>{text}</Linkify>\n"
},
{
"change_type": "MODIFY",
"old_path": "web/input/input-state-container.react.js",
"new_path": "web/input/input-state-container.react.js",
"diff": "@@ -6,7 +6,7 @@ import type {\nDispatchActionPayload,\nDispatchActionPromise,\n} from 'lib/utils/action-utils';\n-import type { PendingMultimediaUpload } from './input-state';\n+import { type PendingMultimediaUpload, InputStateContext } from './input-state';\nimport {\nmessageTypes,\ntype RawMessageInfo,\n@@ -47,13 +47,13 @@ import {\n} from 'lib/actions/message-actions';\nimport { createMediaMessageInfo } from 'lib/shared/message-utils';\n-import ChatMessageList from '../chat/chat-message-list.react';\nimport { validateFile, preloadImage } from '../utils/media-utils';\nimport InvalidUploadModal from '../modals/chat/invalid-upload.react';\nlet nextLocalUploadID = 0;\ntype Props = {|\n+ children: React.Node,\nsetModal: (modal: ?React.Node) => void,\n// Redux state\nactiveChatThreadID: ?string,\n@@ -89,6 +89,7 @@ type State = {|\n|};\nclass InputStateContainer extends React.PureComponent<Props, State> {\nstatic propTypes = {\n+ children: PropTypes.node.isRequired,\nsetModal: PropTypes.func.isRequired,\nactiveChatThreadID: PropTypes.string,\nviewerID: PropTypes.string,\n@@ -316,20 +317,24 @@ class InputStateContainer extends React.PureComponent<Props, State> {\npendingUploads: ?{ [localUploadID: string]: PendingMultimediaUpload },\ndraft: ?string,\n) => {\n- let threadPendingUploads, threadAssignedUploads;\n- if (!pendingUploads) {\n- threadPendingUploads = [];\n- threadAssignedUploads = {};\n- } else {\n+ let threadPendingUploads = [];\n+ const assignedUploads = {};\n+ if (pendingUploads) {\nconst [uploadsWithMessageIDs, uploadsWithoutMessageIDs] = _partition(\n'messageID',\n)(pendingUploads);\nthreadPendingUploads = _sortBy('localID')(uploadsWithoutMessageIDs);\n- threadAssignedUploads = _groupBy('messageID')(uploadsWithMessageIDs);\n+ const threadAssignedUploads = _groupBy('messageID')(\n+ uploadsWithMessageIDs,\n+ );\n+ for (let messageID in threadAssignedUploads) {\n+ // lodash libdefs don't return $ReadOnlyArray\n+ assignedUploads[messageID] = [...threadAssignedUploads[messageID]];\n+ }\n}\nreturn {\npendingUploads: threadPendingUploads,\n- assignedUploads: threadAssignedUploads,\n+ assignedUploads,\ndraft: draft ? draft : '',\nappendFiles: (files: $ReadOnlyArray<File>) =>\nthis.appendFiles(threadID, files),\n@@ -341,12 +346,12 @@ class InputStateContainer extends React.PureComponent<Props, State> {\nthis.createMultimediaMessage(threadID, localID),\nsetDraft: (newDraft: string) => this.setDraft(threadID, newDraft),\nmessageHasUploadFailure: (localMessageID: string) =>\n- this.messageHasUploadFailure(threadAssignedUploads[localMessageID]),\n+ this.messageHasUploadFailure(assignedUploads[localMessageID]),\nretryMultimediaMessage: (localMessageID: string) =>\nthis.retryMultimediaMessage(\nthreadID,\nlocalMessageID,\n- threadAssignedUploads[localMessageID],\n+ assignedUploads[localMessageID],\n),\n};\n},\n@@ -841,16 +846,14 @@ class InputStateContainer extends React.PureComponent<Props, State> {\n}\nrender() {\n- const { activeChatThreadID, setModal } = this.props;\n+ const { activeChatThreadID } = this.props;\nconst inputState = activeChatThreadID\n? this.inputStateSelector(activeChatThreadID)(this.state)\n: null;\nreturn (\n- <ChatMessageList\n- activeChatThreadID={activeChatThreadID}\n- inputState={inputState}\n- setModal={setModal}\n- />\n+ <InputStateContext.Provider value={inputState}>\n+ {this.props.children}\n+ </InputStateContext.Provider>\n);\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "web/input/input-state.js",
"new_path": "web/input/input-state.js",
"diff": "@@ -8,6 +8,7 @@ import {\n} from 'lib/types/media-types';\nimport type { RawTextMessageInfo } from 'lib/types/message-types';\n+import * as React from 'react';\nimport PropTypes from 'prop-types';\nexport type PendingMultimediaUpload = {|\n@@ -31,7 +32,7 @@ export type PendingMultimediaUpload = {|\n// cancelled\nabort: ?() => void,\n|};\n-export const pendingMultimediaUploadPropType = PropTypes.shape({\n+const pendingMultimediaUploadPropType = PropTypes.shape({\nlocalID: PropTypes.string.isRequired,\nserverID: PropTypes.string,\nmessageID: PropTypes.string,\n@@ -64,7 +65,7 @@ export type InputState = {|\nconst arrayOfUploadsPropType = PropTypes.arrayOf(\npendingMultimediaUploadPropType,\n);\n-export const inputStatePropType = PropTypes.shape({\n+const inputStatePropType = PropTypes.shape({\npendingUploads: arrayOfUploadsPropType.isRequired,\nassignedUploads: PropTypes.objectOf(arrayOfUploadsPropType).isRequired,\ndraft: PropTypes.string.isRequired,\n@@ -76,3 +77,34 @@ export const inputStatePropType = PropTypes.shape({\nmessageHasUploadFailure: PropTypes.func.isRequired,\nretryMultimediaMessage: PropTypes.func.isRequired,\n});\n+\n+const InputStateContext = React.createContext<?InputState>(null);\n+\n+function withInputState<\n+ AllProps: {},\n+ ComponentType: React.ComponentType<AllProps>,\n+>(\n+ Component: ComponentType,\n+): React.ComponentType<\n+ $Diff<React.ElementConfig<ComponentType>, { inputState: ?InputState }>,\n+> {\n+ class InputStateHOC extends React.PureComponent<\n+ $Diff<React.ElementConfig<ComponentType>, { inputState: ?InputState }>,\n+ > {\n+ render() {\n+ return (\n+ <InputStateContext.Consumer>\n+ {value => <Component {...this.props} inputState={value} />}\n+ </InputStateContext.Consumer>\n+ );\n+ }\n+ }\n+ return InputStateHOC;\n+}\n+\n+export {\n+ pendingMultimediaUploadPropType,\n+ inputStatePropType,\n+ InputStateContext,\n+ withInputState,\n+};\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [web] InputStateContext |
129,187 | 04.05.2020 18:48:31 | 14,400 | 01e3606e9c7a1dacc1375cb428e00afe195b8f46 | [web] Create media folder | [
{
"change_type": "MODIFY",
"old_path": "server/src/uploads/media-utils.js",
"new_path": "server/src/uploads/media-utils.js",
"diff": "@@ -10,7 +10,7 @@ import bmp from '@vingle/bmp-js';\nimport { readableFilename } from 'lib/utils/file-utils';\nimport { getImageProcessingPlan } from 'lib/utils/image-utils';\n-import { deepFileInfoFromData } from 'web/utils/file-utils';\n+import { deepFileInfoFromData } from 'web/media/file-utils';\nconst allowedMimeTypes = new Set([\n'image/png',\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/chat-input-bar.react.js",
"new_path": "web/chat/chat-input-bar.react.js",
"diff": "@@ -38,8 +38,8 @@ import { threadHasPermission, viewerIsMember } from 'lib/shared/thread-utils';\nimport css from './chat-message-list.css';\nimport LoadingIndicator from '../loading-indicator.react';\nimport { nonThreadCalendarQuery } from '../selectors/nav-selectors';\n-import { allowedMimeTypeString } from '../utils/media-utils';\n-import Multimedia from './multimedia.react';\n+import { allowedMimeTypeString } from '../media/media-utils';\n+import Multimedia from '../media/multimedia.react';\ntype Props = {|\nthreadInfo: ThreadInfo,\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/chat-message-list.css",
"new_path": "web/chat/chat-message-list.css",
"diff": "@@ -269,83 +269,13 @@ div.previews {\noverflow-x: auto;\nwhite-space: nowrap;\n}\n-span.multimedia {\n- display: inline-flex;\n- align-items: center;\n- justify-content: center;\n- position: relative;\n- vertical-align: top;\n-}\ndiv.previews > span.multimedia {\nmargin: 10px;\n}\n-span.multimedia > span.multimediaImage {\n- display: inline-flex;\n- align-items: center;\n- justify-content: center;\n- position: relative;\n- min-height: 50px;\n- min-width: 50px;\n-}\n-span.clickable {\n- cursor: pointer;\n-}\ndiv.previews > span.multimedia > span.multimediaImage > img {\nmax-height: 200px;\nmax-width: 200px;\n}\n-span.multimedia > span.multimediaImage > img {\n- max-height: 200px;\n- max-width: 100%;\n-}\n-span.multimedia > span.multimediaImage > svg.removeUpload {\n- display: none;\n- position: absolute;\n- cursor: pointer;\n- top: 3px;\n- right: 3px;\n- color: white;\n- border-radius: 50%;\n- box-shadow: inset 0px 0px 5px rgba(0,0,0,0.5);\n- background-color: rgba(34,34,34,0.67);\n-}\n-span.multimedia:hover > span.multimediaImage > svg.removeUpload {\n- display: inherit;\n-}\n-span.multimedia > svg.uploadError {\n- position: absolute;\n- top: 0;\n- bottom: 0;\n- left: 0;\n- right: 0;\n- margin: auto auto;\n- color: white;\n- border-radius: 50%;\n- box-shadow: inset 0px 0px 5px rgba(0,0,0,0.5);\n- background-color: #DD2222;\n-}\n-span.multimedia > svg.progressIndicator {\n- position: absolute;\n- top: 0;\n- bottom: 0;\n- left: 0;\n- right: 0;\n- margin: auto auto;\n- width: 50px;\n- height: 50px;\n-}\n-:global(.CircularProgressbar-background) {\n- fill: #666 !important;\n-}\n-:global(.CircularProgressbar-text) {\n- fill: #fff !important;\n-}\n-:global(.CircularProgressbar-path) {\n- stroke: #fff !important;\n-}\n-:global(.CircularProgressbar-trail) {\n- stroke: transparent !important;\n-}\ndiv.messageBox > div.imageGrid {\ndisplay: grid;\n@@ -394,37 +324,3 @@ div.imageGrid > span.multimedia:nth-last-child(n+5):first-child,\ndiv.imageGrid > span.multimedia:nth-last-child(n+5):first-child ~ * {\ngrid-column-end: span 2;\n}\n-\n-div.multimediaModalOverlay {\n- position: fixed;\n- left: 0;\n- top: 0;\n- z-index: 4;\n- width: 100%;\n- height: 100%;\n- background-color: rgba(0,0,0,0.9);\n- overflow: auto;\n- padding: 10px;\n- box-sizing: border-box;\n- display: flex;\n- justify-content: center;\n-}\n-div.multimediaModalOverlay > img {\n- object-fit: scale-down;\n- width: auto;\n- height: auto;\n- max-width: 100%;\n- max-height: 100%;\n-}\n-svg.closeMultimediaModal {\n- position: absolute;\n- cursor: pointer;\n- top: 15px;\n- right: 15px;\n- color: white;\n- border-radius: 50%;\n- box-shadow: inset 0px 0px 5px rgba(0,0,0,0.5);\n- background-color: rgba(34,34,34,0.67);\n- height: 36px;\n- width: 36px;\n-}\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/multimedia-message.react.js",
"new_path": "web/chat/multimedia-message.react.js",
"diff": "@@ -13,7 +13,7 @@ import invariant from 'invariant';\nimport PropTypes from 'prop-types';\nimport css from './chat-message-list.css';\n-import Multimedia from './multimedia.react';\n+import Multimedia from '../media/multimedia.react';\nimport ComposedMessage from './composed-message.react';\nimport sendFailed from './multimedia-message-send-failed';\nimport {\n"
},
{
"change_type": "MODIFY",
"old_path": "web/input/input-state-container.react.js",
"new_path": "web/input/input-state-container.react.js",
"diff": "@@ -47,7 +47,7 @@ import {\n} from 'lib/actions/message-actions';\nimport { createMediaMessageInfo } from 'lib/shared/message-utils';\n-import { validateFile, preloadImage } from '../utils/media-utils';\n+import { validateFile, preloadImage } from '../media/media-utils';\nimport InvalidUploadModal from '../modals/chat/invalid-upload.react';\nlet nextLocalUploadID = 0;\n"
},
{
"change_type": "RENAME",
"old_path": "web/utils/file-utils.js",
"new_path": "web/media/file-utils.js",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "web/utils/media-utils.js",
"new_path": "web/media/media-utils.js",
"diff": ""
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "web/media/media.css",
"diff": "+span.clickable {\n+ cursor: pointer;\n+}\n+\n+span.multimedia {\n+ display: inline-flex;\n+ align-items: center;\n+ justify-content: center;\n+ position: relative;\n+ vertical-align: top;\n+}\n+span.multimedia > span.multimediaImage {\n+ display: inline-flex;\n+ align-items: center;\n+ justify-content: center;\n+ position: relative;\n+ min-height: 50px;\n+ min-width: 50px;\n+}\n+span.multimedia > span.multimediaImage > img {\n+ max-height: 200px;\n+ max-width: 100%;\n+}\n+span.multimedia > span.multimediaImage > svg.removeUpload {\n+ display: none;\n+ position: absolute;\n+ cursor: pointer;\n+ top: 3px;\n+ right: 3px;\n+ color: white;\n+ border-radius: 50%;\n+ box-shadow: inset 0px 0px 5px rgba(0,0,0,0.5);\n+ background-color: rgba(34,34,34,0.67);\n+}\n+span.multimedia:hover > span.multimediaImage > svg.removeUpload {\n+ display: inherit;\n+}\n+span.multimedia > svg.uploadError {\n+ position: absolute;\n+ top: 0;\n+ bottom: 0;\n+ left: 0;\n+ right: 0;\n+ margin: auto auto;\n+ color: white;\n+ border-radius: 50%;\n+ box-shadow: inset 0px 0px 5px rgba(0,0,0,0.5);\n+ background-color: #DD2222;\n+}\n+span.multimedia > svg.progressIndicator {\n+ position: absolute;\n+ top: 0;\n+ bottom: 0;\n+ left: 0;\n+ right: 0;\n+ margin: auto auto;\n+ width: 50px;\n+ height: 50px;\n+}\n+\n+:global(.CircularProgressbar-background) {\n+ fill: #666 !important;\n+}\n+:global(.CircularProgressbar-text) {\n+ fill: #fff !important;\n+}\n+:global(.CircularProgressbar-path) {\n+ stroke: #fff !important;\n+}\n+:global(.CircularProgressbar-trail) {\n+ stroke: transparent !important;\n+}\n+\n+div.multimediaModalOverlay {\n+ position: fixed;\n+ left: 0;\n+ top: 0;\n+ z-index: 4;\n+ width: 100%;\n+ height: 100%;\n+ background-color: rgba(0,0,0,0.9);\n+ overflow: auto;\n+ padding: 10px;\n+ box-sizing: border-box;\n+ display: flex;\n+ justify-content: center;\n+}\n+div.multimediaModalOverlay > img {\n+ object-fit: scale-down;\n+ width: auto;\n+ height: auto;\n+ max-width: 100%;\n+ max-height: 100%;\n+}\n+svg.closeMultimediaModal {\n+ position: absolute;\n+ cursor: pointer;\n+ top: 15px;\n+ right: 15px;\n+ color: white;\n+ border-radius: 50%;\n+ box-shadow: inset 0px 0px 5px rgba(0,0,0,0.5);\n+ background-color: rgba(34,34,34,0.67);\n+ height: 36px;\n+ width: 36px;\n+}\n"
},
{
"change_type": "RENAME",
"old_path": "web/chat/multimedia-modal.react.js",
"new_path": "web/media/multimedia-modal.react.js",
"diff": "@@ -5,7 +5,7 @@ import PropTypes from 'prop-types';\nimport invariant from 'invariant';\nimport { XCircle as XCircleIcon } from 'react-feather';\n-import css from './chat-message-list.css';\n+import css from './media.css';\ntype Props = {|\nuri: string,\n"
},
{
"change_type": "RENAME",
"old_path": "web/chat/multimedia.react.js",
"new_path": "web/media/multimedia.react.js",
"diff": "@@ -16,7 +16,7 @@ import { CircularProgressbar } from 'react-circular-progressbar';\nimport 'react-circular-progressbar/dist/styles.css';\nimport classNames from 'classnames';\n-import css from './chat-message-list.css';\n+import css from './media.css';\nimport MultimediaModal from './multimedia-modal.react';\ntype Props = {|\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [web] Create media folder |
129,187 | 04.05.2020 22:10:30 | 14,400 | f0bd0885e56da30609c315e2597ee87cce40bec1 | Get rid of processing_exception step
No reason to duplicate with the result | [
{
"change_type": "MODIFY",
"old_path": "lib/types/media-types.js",
"new_path": "lib/types/media-types.js",
"diff": "@@ -346,11 +346,6 @@ export type MediaMissionStep =\noutputDimensions: ?Dimensions,\noutputLoop: ?boolean,\n|}\n- | {|\n- step: 'processing_exception',\n- time: number, // ms\n- exceptionMessage: ?string,\n- |}\n| {|\nstep: 'wait_for_capture_uri_unload',\nsuccess: boolean,\n@@ -646,11 +641,6 @@ export const mediaMissionPropType = PropTypes.shape({\noutputDimensions: dimensionsPropType,\noutputLoop: PropTypes.bool,\n}),\n- PropTypes.shape({\n- step: PropTypes.oneOf(['processing_exception']).isRequired,\n- success: PropTypes.bool.isRequired,\n- exceptionMessage: PropTypes.string,\n- }),\nPropTypes.shape({\nstep: PropTypes.oneOf(['wait_for_capture_uri_unload']).isRequired,\nsuccess: PropTypes.bool.isRequired,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/input/input-state-container.react.js",
"new_path": "native/input/input-state-container.react.js",
"diff": "@@ -501,19 +501,12 @@ class InputStateContainer extends React.PureComponent<Props, State> {\n}\nprocessedMedia = processResult;\n} catch (e) {\n- const exceptionMessage = getMessageForException(e);\n- const time = Date.now() - processingStart;\n- steps.push({\n- step: 'processing_exception',\n- time,\n- exceptionMessage,\n- });\nfail('processing failed');\nreturn await finish({\nsuccess: false,\nreason: 'processing_exception',\n- time,\n- exceptionMessage,\n+ time: Date.now() - processingStart,\n+ exceptionMessage: getMessageForException(e),\n});\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Get rid of processing_exception step
No reason to duplicate with the result |
129,187 | 05.05.2020 01:49:32 | 14,400 | f9c17d0e803b2ece3e39c802432977b9665840fc | [web] MediaMission for web upload | [
{
"change_type": "MODIFY",
"old_path": "lib/types/media-types.js",
"new_path": "lib/types/media-types.js",
"diff": "@@ -122,6 +122,17 @@ export type ReadFileHeaderMediaMissionStep = {|\nmediaType: ?MediaType,\n|};\n+export type DetermineFileTypeMediaMissionStep = {|\n+ step: 'determine_file_type',\n+ success: boolean,\n+ exceptionMessage: ?string,\n+ time: number, // ms\n+ inputFilename: string,\n+ outputMIME: ?string,\n+ outputMediaType: ?MediaType,\n+ outputFilename: ?string,\n+|};\n+\nexport type FrameCountMediaMissionStep = {|\nstep: 'frame_count',\nsuccess: boolean,\n@@ -174,6 +185,14 @@ export type CopyFileMediaMissionStep = {|\ndestination: string,\n|};\n+export type GetOrientationMediaMissionStep = {|\n+ step: 'exif_fetch',\n+ success: boolean,\n+ exceptionMessage: ?string,\n+ time: number, // ms\n+ orientation: ?number,\n+|};\n+\nexport type MediaLibrarySelection =\n| {|\nstep: 'photo_library',\n@@ -241,6 +260,13 @@ export type NativeMediaSelection = MediaLibrarySelection | PhotoCapture;\nexport type MediaMissionStep =\n| NativeMediaSelection\n+ | {|\n+ step: 'web_selection',\n+ filename: string,\n+ size: number, // in bytes\n+ mime: string,\n+ selectTime: number, // ms timestamp\n+ |}\n| {|\nstep: 'asset_info_fetch',\nsuccess: boolean,\n@@ -258,6 +284,7 @@ export type MediaMissionStep =\nfileSize: ?number,\n|}\n| ReadFileHeaderMediaMissionStep\n+ | DetermineFileTypeMediaMissionStep\n| FrameCountMediaMissionStep\n| {|\nstep: 'photo_manipulation',\n@@ -318,6 +345,12 @@ export type MediaMissionStep =\ntime: number, // ms\nfirst255Chars: ?string,\n|}\n+ | {|\n+ step: 'array_buffer_from_blob',\n+ success: boolean,\n+ exceptionMessage: ?string,\n+ time: number, // ms\n+ |}\n| {|\nstep: 'mime_check',\nsuccess: boolean,\n@@ -335,6 +368,22 @@ export type MediaMissionStep =\n|}\n| FetchFileHashMediaMissionStep\n| CopyFileMediaMissionStep\n+ | GetOrientationMediaMissionStep\n+ | {|\n+ step: 'preload_image',\n+ success: boolean,\n+ exceptionMessage: ?string,\n+ time: number, // ms\n+ uri: string,\n+ dimensions: ?Dimensions,\n+ |}\n+ | {|\n+ step: 'reorient_image',\n+ success: boolean,\n+ exceptionMessage: ?string,\n+ time: number, // ms\n+ uri: ?string,\n+ |}\n| {|\nstep: 'upload',\nsuccess: boolean,\n@@ -434,6 +483,10 @@ export type MediaMissionFailure =\nsuccess: false,\nreason: 'data_uri_failed',\n|}\n+ | {|\n+ success: false,\n+ reason: 'array_buffer_failed',\n+ |}\n| {|\nsuccess: false,\nreason: 'mime_check_failed',\n@@ -450,6 +503,22 @@ export type MediaMissionFailure =\n| {|\nsuccess: false,\nreason: 'copy_file_failed',\n+ |}\n+ | {|\n+ success: false,\n+ reason: 'exif_fetch_failed',\n+ |}\n+ | {|\n+ success: false,\n+ reason: 'preload_image_failed',\n+ |}\n+ | {|\n+ success: false,\n+ reason: 'reorient_image_failed',\n+ |}\n+ | {|\n+ success: false,\n+ reason: 'web_sibling_validation_failed',\n|};\nexport type MediaMissionResult = MediaMissionFailure | {| success: true |};\n@@ -477,6 +546,13 @@ export const mediaMissionPropType = PropTypes.shape({\nsendTime: PropTypes.number.isRequired,\nretries: PropTypes.number.isRequired,\n}),\n+ PropTypes.shape({\n+ step: PropTypes.oneOf(['web_selection']).isRequired,\n+ filename: PropTypes.string.isRequired,\n+ size: PropTypes.number.isRequired,\n+ mime: PropTypes.string.isRequired,\n+ selectTime: PropTypes.number.isRequired,\n+ }),\nPropTypes.shape({\nstep: PropTypes.oneOf(['asset_info_fetch']).isRequired,\nsuccess: PropTypes.bool.isRequired,\n@@ -502,6 +578,16 @@ export const mediaMissionPropType = PropTypes.shape({\nmime: PropTypes.string,\nmediaType: mediaTypePropType,\n}),\n+ PropTypes.shape({\n+ step: PropTypes.oneOf(['determine_file_type']).isRequired,\n+ success: PropTypes.bool.isRequired,\n+ exceptionMessage: PropTypes.string,\n+ time: PropTypes.number.isRequired,\n+ inputFilename: PropTypes.string.isRequired,\n+ outputMIME: PropTypes.string,\n+ outputMediaType: mediaTypePropType,\n+ outputFilename: PropTypes.string,\n+ }),\nPropTypes.shape({\nstep: PropTypes.oneOf(['frame_count']).isRequired,\nsuccess: PropTypes.bool.isRequired,\n@@ -615,6 +701,12 @@ export const mediaMissionPropType = PropTypes.shape({\ntime: PropTypes.number.isRequired,\nfirst255Chars: PropTypes.string,\n}),\n+ PropTypes.shape({\n+ step: PropTypes.oneOf(['array_buffer_from_blob']).isRequired,\n+ success: PropTypes.bool.isRequired,\n+ exceptionMessage: PropTypes.string,\n+ time: PropTypes.number.isRequired,\n+ }),\nPropTypes.shape({\nstep: PropTypes.oneOf(['mime_check']).isRequired,\nsuccess: PropTypes.bool.isRequired,\n@@ -630,6 +722,28 @@ export const mediaMissionPropType = PropTypes.shape({\npath: PropTypes.string.isRequired,\nlength: PropTypes.number.isRequired,\n}),\n+ PropTypes.shape({\n+ step: PropTypes.oneOf(['exif_fetch']).isRequired,\n+ success: PropTypes.bool.isRequired,\n+ exceptionMessage: PropTypes.string,\n+ time: PropTypes.number.isRequired,\n+ orientation: PropTypes.number,\n+ }),\n+ PropTypes.shape({\n+ step: PropTypes.oneOf(['preload_image']).isRequired,\n+ success: PropTypes.bool.isRequired,\n+ exceptionMessage: PropTypes.string,\n+ time: PropTypes.number.isRequired,\n+ uri: PropTypes.string.isRequired,\n+ dimensions: dimensionsPropType,\n+ }),\n+ PropTypes.shape({\n+ step: PropTypes.oneOf(['reorient_image']).isRequired,\n+ success: PropTypes.bool.isRequired,\n+ exceptionMessage: PropTypes.string,\n+ time: PropTypes.number.isRequired,\n+ uri: PropTypes.string,\n+ }),\nPropTypes.shape({\nstep: PropTypes.oneOf(['upload']).isRequired,\nsuccess: PropTypes.bool.isRequired,\n@@ -733,6 +847,10 @@ export const mediaMissionPropType = PropTypes.shape({\nsuccess: PropTypes.oneOf([false]).isRequired,\nreason: PropTypes.oneOf(['data_uri_failed']).isRequired,\n}),\n+ PropTypes.shape({\n+ success: PropTypes.oneOf([false]).isRequired,\n+ reason: PropTypes.oneOf(['array_buffer_failed']).isRequired,\n+ }),\nPropTypes.shape({\nsuccess: PropTypes.oneOf([false]).isRequired,\nreason: PropTypes.oneOf(['mime_check_failed']).isRequired,\n@@ -750,6 +868,22 @@ export const mediaMissionPropType = PropTypes.shape({\nsuccess: PropTypes.oneOf([false]).isRequired,\nreason: PropTypes.oneOf(['copy_file_failed']).isRequired,\n}),\n+ PropTypes.shape({\n+ success: PropTypes.oneOf([false]).isRequired,\n+ reason: PropTypes.oneOf(['exif_fetch_failed']).isRequired,\n+ }),\n+ PropTypes.shape({\n+ success: PropTypes.oneOf([false]).isRequired,\n+ reason: PropTypes.oneOf(['preload_image_failed']).isRequired,\n+ }),\n+ PropTypes.shape({\n+ success: PropTypes.oneOf([false]).isRequired,\n+ reason: PropTypes.oneOf(['reorient_image_failed']).isRequired,\n+ }),\n+ PropTypes.shape({\n+ success: PropTypes.oneOf([false]).isRequired,\n+ reason: PropTypes.oneOf(['web_sibling_validation_failed']).isRequired,\n+ }),\n]),\nuserTime: PropTypes.number.isRequired,\ntotalTime: PropTypes.number.isRequired,\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/chat-input-bar.react.js",
"new_path": "web/chat/chat-input-bar.react.js",
"diff": "@@ -38,7 +38,7 @@ import { threadHasPermission, viewerIsMember } from 'lib/shared/thread-utils';\nimport css from './chat-message-list.css';\nimport LoadingIndicator from '../loading-indicator.react';\nimport { nonThreadCalendarQuery } from '../selectors/nav-selectors';\n-import { allowedMimeTypeString } from '../media/media-utils';\n+import { allowedMimeTypeString } from '../media/file-utils';\nimport Multimedia from '../media/multimedia.react';\ntype Props = {|\n"
},
{
"change_type": "MODIFY",
"old_path": "web/input/input-state-container.react.js",
"new_path": "web/input/input-state-container.react.js",
"diff": "// @flow\nimport type { AppState } from '../redux-setup';\n-import type { UploadMultimediaResult } from 'lib/types/media-types';\n+import type {\n+ UploadMultimediaResult,\n+ MediaMissionStep,\n+ MediaMissionFailure,\n+ MediaMissionResult,\n+ MediaMission,\n+} from 'lib/types/media-types';\nimport type {\nDispatchActionPayload,\nDispatchActionPromise,\n@@ -17,6 +23,7 @@ import {\ntype SendMessagePayload,\ntype RawTextMessageInfo,\n} from 'lib/types/message-types';\n+import { reportTypes } from 'lib/types/report-types';\nimport * as React from 'react';\nimport PropTypes from 'prop-types';\n@@ -46,6 +53,9 @@ import {\nsendTextMessage,\n} from 'lib/actions/message-actions';\nimport { createMediaMessageInfo } from 'lib/shared/message-utils';\n+import { getMessageForException } from 'lib/utils/errors';\n+import { queueReportsActionType } from 'lib/actions/report-actions';\n+import { getConfig } from 'lib/utils/config';\nimport { validateFile, preloadImage } from '../media/media-utils';\nimport InvalidUploadModal from '../modals/chat/invalid-upload.react';\n@@ -362,44 +372,37 @@ class InputStateContainer extends React.PureComponent<Props, State> {\nthreadID: string,\nfiles: $ReadOnlyArray<File>,\n): Promise<boolean> {\n+ const selectionTime = Date.now();\nconst { setModal } = this.props;\n- let validationResults;\n- try {\n- validationResults = await Promise.all(\n- files.map(file => validateFile(file, this.props.exifRotate)),\n+ const appendResults = await Promise.all(\n+ files.map(file => this.appendFile(file, selectionTime)),\n);\n- } catch (e) {\n- setModal(<InvalidUploadModal setModal={setModal} />);\n- return false;\n- }\n- const newUploads = [];\n- for (let result of validationResults) {\n- if (!result) {\n+ if (appendResults.some(({ result }) => !result.success)) {\nsetModal(<InvalidUploadModal setModal={setModal} />);\n- return false;\n+\n+ const time = Date.now() - selectionTime;\n+ const reports = [];\n+ for (let { steps, result } of appendResults) {\n+ let uploadLocalID;\n+ if (result.success) {\n+ uploadLocalID = result.pendingUpload.localID;\n+ result = { success: false, reason: 'web_sibling_validation_failed' };\n}\n- const { file, mediaType, dimensions } = result;\n- newUploads.push({\n- localID: `localUpload${nextLocalUploadID++}`,\n- serverID: null,\n- messageID: null,\n- failed: null,\n- file,\n- mediaType,\n- dimensions,\n- uri: result.uri,\n- loop: false,\n- uriIsReal: false,\n- progressPercent: 0,\n- abort: null,\n- });\n+ const mediaMission = { steps, result, userTime: time, totalTime: time };\n+ reports.push({ mediaMission, uploadLocalID });\n}\n- if (newUploads.length === 0) {\n- setModal(<InvalidUploadModal setModal={setModal} />);\n+ this.queueMediaMissionReports(reports);\n+\nreturn false;\n}\n+\n+ const newUploads = appendResults.map(({ result }) => {\n+ invariant(result.success, 'any failed validation should be caught above');\n+ return result.pendingUpload;\n+ });\n+\nconst newUploadsObject = _keyBy('localID')(newUploads);\nthis.setState(\nprevState => {\n@@ -419,6 +422,71 @@ class InputStateContainer extends React.PureComponent<Props, State> {\nreturn true;\n}\n+ async appendFile(\n+ file: File,\n+ selectTime: number,\n+ ): Promise<{\n+ steps: $ReadOnlyArray<MediaMissionStep>,\n+ result:\n+ | MediaMissionFailure\n+ | {| success: true, pendingUpload: PendingMultimediaUpload |},\n+ }> {\n+ const steps = [\n+ {\n+ step: 'web_selection',\n+ filename: file.name,\n+ size: file.size,\n+ mime: file.type,\n+ selectTime,\n+ },\n+ ];\n+\n+ let response;\n+ const validationStart = Date.now();\n+ try {\n+ response = await validateFile(file, this.props.exifRotate);\n+ } catch (e) {\n+ return {\n+ steps,\n+ result: {\n+ success: false,\n+ reason: 'processing_exception',\n+ time: Date.now() - validationStart,\n+ exceptionMessage: getMessageForException(e),\n+ },\n+ };\n+ }\n+ const { steps: validationSteps, result } = response;\n+ steps.push(...validationSteps);\n+ if (!result.success) {\n+ return { steps, result };\n+ }\n+\n+ const { uri, file: fixedFile, mediaType, dimensions } = result;\n+ return {\n+ steps,\n+ result: {\n+ success: true,\n+ pendingUpload: {\n+ localID: `localUpload${nextLocalUploadID++}`,\n+ serverID: null,\n+ messageID: null,\n+ failed: null,\n+ file: fixedFile,\n+ mediaType,\n+ dimensions,\n+ uri,\n+ loop: false,\n+ uriIsReal: false,\n+ progressPercent: 0,\n+ abort: null,\n+ steps,\n+ selectTime,\n+ },\n+ },\n+ };\n+ }\n+\nuploadFiles(\nthreadID: string,\nuploads: $ReadOnlyArray<PendingMultimediaUpload>,\n@@ -429,35 +497,79 @@ class InputStateContainer extends React.PureComponent<Props, State> {\n}\nasync uploadFile(threadID: string, upload: PendingMultimediaUpload) {\n- let result;\n+ const { selectTime, localID } = upload;\n+ const steps = [...upload.steps];\n+ let userTime;\n+\n+ const sendReport = (missionResult: MediaMissionResult) => {\n+ const latestUpload = this.state.pendingUploads[threadID][localID];\n+ invariant(\n+ latestUpload,\n+ `pendingUpload ${localID} for ${threadID} missing in sendReport`,\n+ );\n+ const { serverID, messageID } = latestUpload;\n+ const totalTime = Date.now() - selectTime;\n+ userTime = userTime ? userTime : totalTime;\n+ const mission = { steps, result: missionResult, totalTime, userTime };\n+ this.queueMediaMissionReports([\n+ {\n+ mediaMission: mission,\n+ uploadLocalID: localID,\n+ uploadServerID: serverID,\n+ messageLocalID: messageID,\n+ },\n+ ]);\n+ };\n+\n+ let uploadResult, uploadExceptionMessage;\n+ const uploadStart = Date.now();\ntry {\n- result = await this.props.uploadMultimedia(\n+ uploadResult = await this.props.uploadMultimedia(\nupload.file,\n{ ...upload.dimensions, loop: false },\n{\nonProgress: (percent: number) =>\n- this.setProgress(threadID, upload.localID, percent),\n+ this.setProgress(threadID, localID, percent),\nabortHandler: (abort: () => void) =>\n- this.handleAbortCallback(threadID, upload.localID, abort),\n+ this.handleAbortCallback(threadID, localID, abort),\n},\n);\n} catch (e) {\n- this.handleUploadFailure(threadID, upload.localID, e);\n+ uploadExceptionMessage = getMessageForException(e);\n+ this.handleUploadFailure(threadID, localID, e);\n+ }\n+ userTime = Date.now() - selectTime;\n+ steps.push({\n+ step: 'upload',\n+ success: !!uploadResult,\n+ exceptionMessage: uploadExceptionMessage,\n+ time: Date.now() - uploadStart,\n+ inputFilename: upload.file.name,\n+ outputMediaType: uploadResult && uploadResult.mediaType,\n+ outputURI: uploadResult && uploadResult.uri,\n+ outputDimensions: uploadResult && uploadResult.dimensions,\n+ outputLoop: uploadResult && uploadResult.loop,\n+ });\n+ if (!uploadResult) {\n+ sendReport({\n+ success: false,\n+ reason: 'http_upload_failed',\n+ exceptionMessage: uploadExceptionMessage,\n+ });\nreturn;\n}\n+ const result = uploadResult;\n- const uploadAfterSuccess = this.state.pendingUploads[threadID][\n- upload.localID\n- ];\n+ const uploadAfterSuccess = this.state.pendingUploads[threadID][localID];\ninvariant(\nuploadAfterSuccess,\n- `pendingUpload ${upload.localID}/${result.id} for ${threadID} missing ` +\n+ `pendingUpload ${localID}/${result.id} for ${threadID} missing ` +\n`after upload`,\n);\nif (uploadAfterSuccess.messageID) {\nthis.props.dispatchActionPayload(updateMultimediaMessageMediaActionType, {\nmessageID: uploadAfterSuccess.messageID,\n- currentMediaID: upload.localID,\n+ currentMediaID: localID,\nmediaUpdate: {\nid: result.id,\n},\n@@ -466,10 +578,10 @@ class InputStateContainer extends React.PureComponent<Props, State> {\nthis.setState(prevState => {\nconst uploads = prevState.pendingUploads[threadID];\n- const currentUpload = uploads[upload.localID];\n+ const currentUpload = uploads[localID];\ninvariant(\ncurrentUpload,\n- `pendingUpload ${upload.localID}/${result.id} for ${threadID} ` +\n+ `pendingUpload ${localID}/${result.id} for ${threadID} ` +\n`missing while assigning serverID`,\n);\nreturn {\n@@ -477,7 +589,7 @@ class InputStateContainer extends React.PureComponent<Props, State> {\n...prevState.pendingUploads,\n[threadID]: {\n...uploads,\n- [upload.localID]: {\n+ [localID]: {\n...currentUpload,\nserverID: result.id,\nabort: null,\n@@ -487,14 +599,14 @@ class InputStateContainer extends React.PureComponent<Props, State> {\n};\n});\n- await preloadImage(result.uri);\n+ const { steps: preloadSteps } = await preloadImage(result.uri);\n+ steps.push(...preloadSteps);\n+ sendReport({ success: true });\n- const uploadAfterPreload = this.state.pendingUploads[threadID][\n- upload.localID\n- ];\n+ const uploadAfterPreload = this.state.pendingUploads[threadID][localID];\ninvariant(\nuploadAfterPreload,\n- `pendingUpload ${upload.localID}/${result.id} for ${threadID} missing ` +\n+ `pendingUpload ${localID}/${result.id} for ${threadID} missing ` +\n`after preload`,\n);\nif (uploadAfterPreload.messageID) {\n@@ -510,15 +622,15 @@ class InputStateContainer extends React.PureComponent<Props, State> {\nthis.setState(prevState => {\nconst uploads = prevState.pendingUploads[threadID];\n- const currentUpload = uploads[upload.localID];\n+ const currentUpload = uploads[localID];\ninvariant(\ncurrentUpload,\n- `pendingUpload ${upload.localID}/${result.id} for ${threadID} ` +\n+ `pendingUpload ${localID}/${result.id} for ${threadID} ` +\n`missing while assigning URI`,\n);\nconst { messageID } = currentUpload;\nif (messageID && !messageID.startsWith('local')) {\n- const newPendingUploads = _omit([upload.localID])(uploads);\n+ const newPendingUploads = _omit([localID])(uploads);\nreturn {\npendingUploads: {\n...prevState.pendingUploads,\n@@ -531,7 +643,7 @@ class InputStateContainer extends React.PureComponent<Props, State> {\n...prevState.pendingUploads,\n[threadID]: {\n...uploads,\n- [upload.localID]: {\n+ [localID]: {\n...currentUpload,\nuri: result.uri,\nmediaType: result.mediaType,\n@@ -599,6 +711,28 @@ class InputStateContainer extends React.PureComponent<Props, State> {\n});\n}\n+ queueMediaMissionReports(\n+ partials: $ReadOnlyArray<{|\n+ mediaMission: MediaMission,\n+ uploadLocalID?: ?string,\n+ uploadServerID?: ?string,\n+ messageLocalID?: ?string,\n+ |}>,\n+ ) {\n+ const reports = partials.map(\n+ ({ mediaMission, uploadLocalID, uploadServerID, messageLocalID }) => ({\n+ type: reportTypes.MEDIA_MISSION,\n+ time: Date.now(),\n+ platformDetails: getConfig().platformDetails,\n+ mediaMission,\n+ uploadServerID,\n+ uploadLocalID,\n+ messageLocalID,\n+ }),\n+ );\n+ this.props.dispatchActionPayload(queueReportsActionType, { reports });\n+ }\n+\ncancelPendingUpload(threadID: string, localUploadID: string) {\nlet revokeURL, abortRequest;\nthis.setState(\n"
},
{
"change_type": "MODIFY",
"old_path": "web/input/input-state.js",
"new_path": "web/input/input-state.js",
"diff": "@@ -5,6 +5,8 @@ import {\nmediaTypePropType,\ntype Dimensions,\ndimensionsPropType,\n+ type MediaMissionStep,\n+ mediaMissionPropType,\n} from 'lib/types/media-types';\nimport type { RawTextMessageInfo } from 'lib/types/message-types';\n@@ -31,6 +33,8 @@ export type PendingMultimediaUpload = {|\n// This is set once the network request begins and used if the upload is\n// cancelled\nabort: ?() => void,\n+ steps: MediaMissionStep[],\n+ selectTime: number,\n|};\nconst pendingMultimediaUploadPropType = PropTypes.shape({\nlocalID: PropTypes.string.isRequired,\n@@ -45,6 +49,8 @@ const pendingMultimediaUploadPropType = PropTypes.shape({\nuriIsReal: PropTypes.bool.isRequired,\nprogressPercent: PropTypes.number.isRequired,\nabort: PropTypes.func,\n+ steps: PropTypes.arrayOf(mediaMissionPropType).isRequired,\n+ selectTime: PropTypes.number.isRequired,\n});\n// This type represents the input state for a particular thread\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "web/media/blob-utils.js",
"diff": "+// @flow\n+\n+import type {\n+ MediaType,\n+ MediaMissionStep,\n+ MediaMissionFailure,\n+} from 'lib/types/media-types';\n+\n+import invariant from 'invariant';\n+\n+import { getMessageForException } from 'lib/utils/errors';\n+\n+import { determineFileType } from './file-utils';\n+\n+function blobToArrayBuffer(blob: Blob): Promise<ArrayBuffer> {\n+ const fileReader = new FileReader();\n+ return new Promise((resolve, reject) => {\n+ fileReader.onerror = error => {\n+ fileReader.abort();\n+ reject(error);\n+ };\n+ fileReader.onload = () => {\n+ invariant(\n+ fileReader.result instanceof ArrayBuffer,\n+ 'FileReader.readAsArrayBuffer should result in ArrayBuffer',\n+ );\n+ resolve(fileReader.result);\n+ };\n+ fileReader.readAsArrayBuffer(blob);\n+ });\n+}\n+\n+type ProbeFileSuccess = {|\n+ success: true,\n+ file: File,\n+ mediaType: MediaType,\n+|};\n+async function probeFile(\n+ file: File,\n+): Promise<{|\n+ steps: $ReadOnlyArray<MediaMissionStep>,\n+ result: MediaMissionFailure | ProbeFileSuccess,\n+|}> {\n+ const steps = [];\n+\n+ let arrayBuffer, arrayBufferExceptionMessage;\n+ const arrayBufferStart = Date.now();\n+ try {\n+ arrayBuffer = await blobToArrayBuffer(file);\n+ } catch (e) {\n+ arrayBufferExceptionMessage = getMessageForException(e);\n+ }\n+ steps.push({\n+ step: 'array_buffer_from_blob',\n+ success: !!arrayBuffer,\n+ exceptionMessage: arrayBufferExceptionMessage,\n+ time: Date.now() - arrayBufferStart,\n+ });\n+ if (!arrayBuffer) {\n+ return { steps, result: { success: false, reason: 'array_buffer_failed' } };\n+ }\n+\n+ const determineFileTypeStep = determineFileType(arrayBuffer, file.name);\n+ steps.push(determineFileTypeStep);\n+ const {\n+ outputMIME: mime,\n+ outputMediaType: mediaType,\n+ outputFilename: name,\n+ } = determineFileTypeStep;\n+ if (!mime || !mediaType || !name) {\n+ return {\n+ steps,\n+ result: {\n+ success: false,\n+ reason: 'media_type_fetch_failed',\n+ detectedMIME: mime,\n+ },\n+ };\n+ }\n+\n+ const fixedFile =\n+ name !== file.name || mime !== file.type\n+ ? new File([file], name, { type: mime })\n+ : file;\n+ return { steps, result: { success: true, file: fixedFile, mediaType } };\n+}\n+\n+export { probeFile };\n"
},
{
"change_type": "MODIFY",
"old_path": "web/media/file-utils.js",
"new_path": "web/media/file-utils.js",
"diff": "// @flow\n+import type { DetermineFileTypeMediaMissionStep } from 'lib/types/media-types';\n+\nimport isSvg from 'is-svg';\nimport {\nfileInfoFromData,\ntype FileDataInfo,\nmimeTypesToMediaTypes,\n+ readableFilename,\n} from 'lib/utils/file-utils';\n+import { getMessageForException } from 'lib/utils/errors';\nfunction deepFileInfoFromData(data: Buffer | ArrayBuffer): FileDataInfo {\nconst result = fileInfoFromData(data);\n@@ -21,4 +25,54 @@ function deepFileInfoFromData(data: Buffer | ArrayBuffer): FileDataInfo {\nreturn { mime, mediaType: mimeTypesToMediaTypes[mime] };\n}\n-export { deepFileInfoFromData };\n+function determineFileType(\n+ arrayBuffer: ArrayBuffer,\n+ filename: string,\n+): DetermineFileTypeMediaMissionStep {\n+ let mime, mediaType, exceptionMessage;\n+ const start = Date.now();\n+ try {\n+ ({ mime, mediaType } = deepFileInfoFromData(arrayBuffer));\n+ } catch (e) {\n+ exceptionMessage = getMessageForException(e);\n+ }\n+\n+ if (!mime || !mediaType || !allowedMimeTypes.has(mime)) {\n+ return {\n+ step: 'determine_file_type',\n+ success: false,\n+ exceptionMessage,\n+ time: Date.now() - start,\n+ inputFilename: filename,\n+ outputMIME: mime,\n+ outputMediaType: mediaType,\n+ outputFilename: null,\n+ };\n+ }\n+\n+ const name = readableFilename(filename, mime);\n+ return {\n+ step: 'determine_file_type',\n+ success: !!name,\n+ exceptionMessage,\n+ time: Date.now() - start,\n+ inputFilename: filename,\n+ outputMIME: mime,\n+ outputMediaType: mediaType,\n+ outputFilename: name,\n+ };\n+}\n+\n+const allowedMimeTypeArray = [\n+ 'image/png',\n+ 'image/jpeg',\n+ 'image/gif',\n+ 'image/webp',\n+ 'image/tiff',\n+ 'image/svg+xml',\n+ 'image/bmp',\n+];\n+const allowedMimeTypes = new Set(allowedMimeTypeArray);\n+const allowedMimeTypeString = allowedMimeTypeArray.join(',');\n+\n+export { deepFileInfoFromData, determineFileType, allowedMimeTypeString };\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "web/media/image-utils.js",
"diff": "+// @flow\n+\n+import type { GetOrientationMediaMissionStep } from 'lib/types/media-types';\n+\n+import EXIF from 'exif-js';\n+\n+import { getMessageForException } from 'lib/utils/errors';\n+\n+function getEXIFOrientation(file: File): Promise<?number> {\n+ return new Promise(resolve => {\n+ EXIF.getData(file, function() {\n+ resolve(EXIF.getTag(this, 'Orientation'));\n+ });\n+ });\n+}\n+\n+async function getOrientation(\n+ file: File,\n+): Promise<GetOrientationMediaMissionStep> {\n+ let orientation,\n+ success = false,\n+ exceptionMessage;\n+ const start = Date.now();\n+ try {\n+ orientation = await getEXIFOrientation(file);\n+ success = true;\n+ } catch (e) {\n+ exceptionMessage = getMessageForException(e);\n+ }\n+ return {\n+ step: 'exif_fetch',\n+ success,\n+ exceptionMessage,\n+ time: Date.now() - start,\n+ orientation,\n+ };\n+}\n+\n+export { getOrientation };\n"
},
{
"change_type": "MODIFY",
"old_path": "web/media/media-utils.js",
"new_path": "web/media/media-utils.js",
"diff": "// @flow\n-import type { MediaType, Dimensions } from 'lib/types/media-types';\n+import type {\n+ MediaType,\n+ Dimensions,\n+ MediaMissionStep,\n+ MediaMissionFailure,\n+} from 'lib/types/media-types';\n-import { readableFilename } from 'lib/utils/file-utils';\n-import invariant from 'invariant';\n-import EXIF from 'exif-js';\n+import { getMessageForException } from 'lib/utils/errors';\n-import { deepFileInfoFromData } from './file-utils';\n+import { probeFile } from './blob-utils';\n+import { getOrientation } from './image-utils';\n-function blobToArrayBuffer(blob: Blob): Promise<ArrayBuffer> {\n- const fileReader = new FileReader();\n- return new Promise((resolve, reject) => {\n- fileReader.onerror = error => {\n- fileReader.abort();\n- reject(error);\n- };\n- fileReader.onload = () => {\n- invariant(\n- fileReader.result instanceof ArrayBuffer,\n- 'FileReader.readAsArrayBuffer should result in ArrayBuffer',\n- );\n- resolve(fileReader.result);\n+type PreloadImageSuccess = {|\n+ success: true,\n+ image: Image,\n+|};\n+async function preloadImage(\n+ uri: string,\n+): Promise<{|\n+ steps: $ReadOnlyArray<MediaMissionStep>,\n+ result: MediaMissionFailure | PreloadImageSuccess,\n+|}> {\n+ let image, exceptionMessage;\n+ const start = Date.now();\n+ try {\n+ image = await new Promise((resolve, reject) => {\n+ const img = new Image();\n+ img.src = uri;\n+ img.onload = () => {\n+ resolve(img);\n};\n- fileReader.readAsArrayBuffer(blob);\n+ img.onerror = reject;\n});\n+ } catch (e) {\n+ exceptionMessage = getMessageForException(e);\n}\n-\n-function getOrientation(file: File): Promise<?number> {\n- return new Promise(resolve => {\n- EXIF.getData(file, function() {\n- resolve(EXIF.getTag(this, 'Orientation'));\n- });\n- });\n+ const result = image\n+ ? { success: true, image }\n+ : { success: false, reason: 'preload_image_failed' };\n+ const dimensions = image\n+ ? { height: image.height, width: image.width }\n+ : null;\n+ const step = {\n+ step: 'preload_image',\n+ success: !!image,\n+ exceptionMessage,\n+ time: Date.now() - start,\n+ uri,\n+ dimensions,\n+ };\n+ return { steps: [step], result };\n}\n-type ProcessFileResult = {|\n+type ProcessFileSuccess = {|\n+ success: true,\nuri: string,\ndimensions: Dimensions,\n|};\nasync function processFile(\nfile: File,\nexifRotate: boolean,\n-): Promise<ProcessFileResult> {\n+): Promise<{|\n+ steps: $ReadOnlyArray<MediaMissionStep>,\n+ result: MediaMissionFailure | ProcessFileSuccess,\n+|}> {\nconst initialURI = URL.createObjectURL(file);\nif (!exifRotate) {\n- const { width, height } = await preloadImage(initialURI);\n+ const { steps, result } = await preloadImage(initialURI);\n+ if (!result.success) {\n+ return { steps, result };\n+ }\n+ const { width, height } = result.image;\nconst dimensions = { width, height };\n- return { uri: initialURI, dimensions };\n+ return { steps, result: { success: true, uri: initialURI, dimensions } };\n}\n- const [image, orientation] = await Promise.all([\n+ const [preloadResponse, orientationStep] = await Promise.all([\npreloadImage(initialURI),\ngetOrientation(file),\n]);\n+ const { steps: preloadSteps, result: preloadResult } = preloadResponse;\n+\n+ const steps = [...preloadSteps, orientationStep];\n+\n+ if (!preloadResult.success) {\n+ return { steps, result: preloadResult };\n+ }\n+ const { image } = preloadResult;\n+\n+ if (!orientationStep.success) {\n+ return { steps, result: { success: false, reason: 'exif_fetch_failed' } };\n+ }\n+ const { orientation } = orientationStep;\nconst dimensions =\n!!orientation && orientation > 4\n? { width: image.height, height: image.width }\n: { width: image.width, height: image.height };\n+ let reorientedBlob, reorientExceptionMessage;\n+ const reorientStart = Date.now();\n+ try {\nconst canvas = document.createElement('canvas');\nconst context = canvas.getContext('2d');\ncanvas.height = dimensions.height;\n@@ -83,17 +126,33 @@ async function processFile(\n}\ncontext.drawImage(image, 0, 0);\n- const blob = await new Promise(resolve =>\n+ reorientedBlob = await new Promise(resolve =>\ncanvas.toBlob(blobResult => resolve(blobResult)),\n);\n-\n+ } catch (e) {\n+ reorientExceptionMessage = getMessageForException(e);\n+ }\nURL.revokeObjectURL(initialURI);\n- const uri = URL.createObjectURL(blob);\n- return { uri, dimensions };\n+ const uri = reorientedBlob && URL.createObjectURL(reorientedBlob);\n+ steps.push({\n+ step: 'reorient_image',\n+ success: !!reorientedBlob,\n+ exceptionMessage: reorientExceptionMessage,\n+ time: Date.now() - reorientStart,\n+ uri,\n+ });\n+\n+ if (!uri) {\n+ return {\n+ steps,\n+ result: { success: false, reason: 'reorient_image_failed' },\n+ };\n+ }\n+ return { steps, result: { success: true, uri, dimensions } };\n}\n-// Returns null if unsupported\n-type FileValidationResult = {|\n+type FileValidationSuccess = {|\n+ success: true,\nfile: File,\nmediaType: MediaType,\nuri: string,\n@@ -102,51 +161,39 @@ type FileValidationResult = {|\nasync function validateFile(\nfile: File,\nexifRotate: boolean,\n-): Promise<?FileValidationResult> {\n- const [arrayBuffer, processResult] = await Promise.all([\n- blobToArrayBuffer(file),\n+): Promise<{|\n+ steps: $ReadOnlyArray<MediaMissionStep>,\n+ result: MediaMissionFailure | FileValidationSuccess,\n+|}> {\n+ const [probeResponse, processResponse] = await Promise.all([\n+ probeFile(file),\nprocessFile(file, exifRotate),\n]);\n+ const { steps: probeSteps, result: probeResult } = probeResponse;\n+ const { steps: processSteps, result: processResult } = processResponse;\n- const { mime, mediaType } = deepFileInfoFromData(arrayBuffer);\n- if (!mime || !mediaType || !allowedMimeTypes.has(mime)) {\n- return null;\n- }\n- const name = readableFilename(file.name, mime);\n- if (!name) {\n- return null;\n- }\n+ const steps = [...probeSteps, ...processSteps];\n- const fixedFile =\n- name !== file.name || mime !== file.type\n- ? new File([file], name, { type: mime })\n- : file;\n+ if (!probeResult.success) {\n+ return { steps, result: probeResult };\n+ }\n+ const { file: fixedFile, mediaType } = probeResult;\n- const { dimensions, uri } = processResult;\n- return { file: fixedFile, mediaType, uri, dimensions };\n+ if (!processResult.success) {\n+ return { steps, result: processResult };\n}\n+ const { dimensions, uri } = processResult;\n-const allowedMimeTypeArray = [\n- 'image/png',\n- 'image/jpeg',\n- 'image/gif',\n- 'image/webp',\n- 'image/tiff',\n- 'image/svg+xml',\n- 'image/bmp',\n-];\n-const allowedMimeTypes = new Set(allowedMimeTypeArray);\n-const allowedMimeTypeString = allowedMimeTypeArray.join(',');\n-\n-function preloadImage(uri: string): Promise<Image> {\n- return new Promise((resolve, reject) => {\n- const img = new Image();\n- img.src = uri;\n- img.onload = () => {\n- resolve(img);\n+ return {\n+ steps,\n+ result: {\n+ success: true,\n+ file: fixedFile,\n+ mediaType,\n+ uri,\n+ dimensions,\n+ },\n};\n- img.onerror = reject;\n- });\n}\n-export { validateFile, allowedMimeTypeString, preloadImage };\n+export { preloadImage, validateFile };\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [web] MediaMission for web upload |
129,187 | 05.05.2020 01:57:58 | 14,400 | eac7694f03f23896ae7aefa43886dce5865daef3 | [web] Don't reorient image unless we need to | [
{
"change_type": "MODIFY",
"old_path": "web/media/media-utils.js",
"new_path": "web/media/media-utils.js",
"diff": "@@ -98,6 +98,9 @@ async function processFile(\n!!orientation && orientation > 4\n? { width: image.height, height: image.width }\n: { width: image.width, height: image.height };\n+ if (!orientation || orientation === 1) {\n+ return { steps, result: { success: true, uri: initialURI, dimensions } };\n+ }\nlet reorientedBlob, reorientExceptionMessage;\nconst reorientStart = Date.now();\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [web] Don't reorient image unless we need to |
129,187 | 05.05.2020 02:01:05 | 14,400 | a9ed0692f5f0f1b2ead81778b4e398e68bf1281a | [lib] Fix loop param conversion in uploadMultimedia | [
{
"change_type": "MODIFY",
"old_path": "lib/actions/upload-actions.js",
"new_path": "lib/actions/upload-actions.js",
"diff": "@@ -26,8 +26,8 @@ async function uploadMultimedia(\nwidth: extras.width.toString(),\n};\nconst stringExtras = extras.loop\n- ? stringDimensions\n- : { ...stringDimensions, loop: '1' };\n+ ? { ...stringDimensions, loop: '1' }\n+ : stringDimensions;\nconst response = await fetchJSON(\n'upload_multimedia',\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [lib] Fix loop param conversion in uploadMultimedia |
129,187 | 05.05.2020 12:58:14 | 14,400 | e068a859a271bb5a3c31cb5287b2d0d93b3d42ad | [web] Fix Multimedia style
Was cross-referencing CSS modules | [
{
"change_type": "MODIFY",
"old_path": "web/chat/chat-input-bar.react.js",
"new_path": "web/chat/chat-input-bar.react.js",
"diff": "@@ -159,6 +159,8 @@ class ChatInputBar extends React.PureComponent<Props> {\nuri={pendingUpload.uri}\npendingUpload={pendingUpload}\nremove={cancelPendingUpload}\n+ multimediaCSSClass={css.multimedia}\n+ multimediaImageCSSClass={css.multimediaImage}\nkey={pendingUpload.localID}\n/>\n));\n"
},
{
"change_type": "MODIFY",
"old_path": "web/chat/multimedia-message.react.js",
"new_path": "web/chat/multimedia-message.react.js",
"diff": "@@ -61,6 +61,8 @@ class MultimediaMessage extends React.PureComponent<Props> {\nuri={singleMedia.uri}\npendingUpload={pendingUpload}\nsetModal={setModal}\n+ multimediaCSSClass={css.multimedia}\n+ multimediaImageCSSClass={css.multimediaImage}\nkey={singleMedia.id}\n/>,\n);\n"
},
{
"change_type": "MODIFY",
"old_path": "web/media/multimedia.react.js",
"new_path": "web/media/multimedia.react.js",
"diff": "@@ -24,6 +24,8 @@ type Props = {|\npendingUpload?: ?PendingMultimediaUpload,\nremove?: (uploadID: string) => void,\nsetModal?: (modal: ?React.Node) => void,\n+ multimediaCSSClass: string,\n+ multimediaImageCSSClass: string,\n|};\nclass Multimedia extends React.PureComponent<Props> {\nstatic propTypes = {\n@@ -31,6 +33,8 @@ class Multimedia extends React.PureComponent<Props> {\npendingUpload: pendingMultimediaUploadPropType,\nremove: PropTypes.func,\nsetModal: PropTypes.func,\n+ multimediaCSSClass: PropTypes.string.isRequired,\n+ multimediaImageCSSClass: PropTypes.string.isRequired,\n};\ncomponentDidUpdate(prevProps: Props) {\n@@ -80,15 +84,19 @@ class Multimedia extends React.PureComponent<Props> {\n}\n}\n- const imageContainerClasses = [css.multimediaImage];\n+ const imageContainerClasses = [\n+ css.multimediaImage,\n+ this.props.multimediaImageCSSClass,\n+ ];\nlet onClick;\nif (setModal) {\nimageContainerClasses.push(css.clickable);\nonClick = this.onClick;\n}\n+ const containerClasses = [css.multimedia, this.props.multimediaCSSClass];\nreturn (\n- <span className={css.multimedia}>\n+ <span className={classNames(containerClasses)}>\n<span className={classNames(imageContainerClasses)} onClick={onClick}>\n<img src={this.props.uri} />\n{removeButton}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [web] Fix Multimedia style
Was cross-referencing CSS modules |
129,187 | 05.05.2020 12:59:43 | 14,400 | a999fb2a306f0ff0c58e7116cbad39c8ff935716 | [web] Don't rotate EXIF on Chrome anymore
It now behaves like Safari and auto-rotates it for you | [
{
"change_type": "MODIFY",
"old_path": "web/input/input-state-container.react.js",
"new_path": "web/input/input-state-container.react.js",
"diff": "@@ -995,7 +995,8 @@ class InputStateContainer extends React.PureComponent<Props, State> {\nexport default connect(\n(state: AppState) => {\nconst browser = detectBrowser(state.userAgent);\n- const exifRotate = !browser || browser.name !== 'safari';\n+ const exifRotate =\n+ !browser || (browser.name !== 'safari' && browser.name !== 'chrome');\nreturn {\nactiveChatThreadID: state.navInfo.activeChatThreadID,\nviewerID: state.currentUserInfo && state.currentUserInfo.id,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [web] Don't rotate EXIF on Chrome anymore
It now behaves like Safari and auto-rotates it for you |
129,187 | 05.05.2020 15:23:27 | 14,400 | 34518f8bb644ef1084f03e59f05f14f45c34fa53 | Centralize config for MIME types in one place | [
{
"change_type": "MODIFY",
"old_path": "lib/utils/file-utils.js",
"new_path": "lib/utils/file-utils.js",
"diff": "import type { MediaType } from '../types/media-types';\nimport fileType from 'file-type';\n+import invariant from 'invariant';\n-const mimeTypesToMediaTypes = Object.freeze({\n- 'image/png': 'photo',\n- 'image/jpeg': 'photo',\n- 'image/gif': 'photo',\n- 'image/heic': 'photo',\n- 'image/webp': 'photo',\n- 'image/tiff': 'photo',\n- 'image/svg+xml': 'photo',\n- 'image/bmp': 'photo',\n- 'video/mp4': 'video',\n- 'video/quicktime': 'video',\n+type ResultMIME = 'image/png' | 'image/jpeg';\n+type MediaConfig = {|\n+ mediaType: 'photo' | 'video' | 'photo_or_video',\n+ extension: string,\n+ serverCanTranscode: boolean,\n+ imageConfig?: $Shape<{|\n+ convertTo: ResultMIME,\n+ |}>,\n+ videoConfig?: $Shape<{|\n+ loop: boolean,\n+ |}>,\n+|};\n+const mediaConfig: { [mime: string]: MediaConfig } = Object.freeze({\n+ 'image/png': {\n+ mediaType: 'photo',\n+ extension: 'png',\n+ serverCanTranscode: true,\n+ },\n+ 'image/jpeg': {\n+ mediaType: 'photo',\n+ extension: 'jpg',\n+ serverCanTranscode: true,\n+ },\n+ 'image/gif': {\n+ mediaType: 'photo_or_video',\n+ extension: 'gif',\n+ serverCanTranscode: true,\n+ imageConfig: {\n+ convertTo: 'image/png',\n+ },\n+ videoConfig: {\n+ loop: true,\n+ },\n+ },\n+ 'image/heic': {\n+ mediaType: 'photo',\n+ extension: 'heic',\n+ serverCanTranscode: false,\n+ imageConfig: {\n+ convertTo: 'image/jpeg',\n+ },\n+ },\n+ 'image/webp': {\n+ mediaType: 'photo',\n+ extension: 'webp',\n+ serverCanTranscode: true,\n+ imageConfig: {\n+ convertTo: 'image/jpeg',\n+ },\n+ },\n+ 'image/tiff': {\n+ mediaType: 'photo',\n+ extension: 'tiff',\n+ serverCanTranscode: true,\n+ imageConfig: {\n+ convertTo: 'image/jpeg',\n+ },\n+ },\n+ 'image/svg+xml': {\n+ mediaType: 'photo',\n+ extension: 'svg',\n+ serverCanTranscode: true,\n+ imageConfig: {\n+ convertTo: 'image/png',\n+ },\n+ },\n+ 'image/bmp': {\n+ mediaType: 'photo',\n+ extension: 'bmp',\n+ serverCanTranscode: true,\n+ imageConfig: {\n+ convertTo: 'image/png',\n+ },\n+ },\n+ 'video/mp4': {\n+ mediaType: 'video',\n+ extension: 'mp4',\n+ serverCanTranscode: false,\n+ },\n+ 'video/quicktime': {\n+ mediaType: 'video',\n+ extension: 'mp4',\n+ serverCanTranscode: false,\n+ },\n});\n-const mimeTypesToExtensions = Object.freeze({\n- 'image/png': 'png',\n- 'image/jpeg': 'jpg',\n- 'image/gif': 'gif',\n- 'image/heic': 'heic',\n- 'image/webp': 'webp',\n- 'image/tiff': 'tiff',\n- 'image/svg+xml': 'svg',\n- 'image/bmp': 'bmp',\n- 'video/mp4': 'mp4',\n- 'video/quicktime': 'mp4',\n-});\n+const serverTranscodableTypes: Set<$Keys<typeof mediaConfig>> = new Set();\n+for (let mime in mediaConfig) {\n+ if (mediaConfig[mime].serverCanTranscode) {\n+ serverTranscodableTypes.add(mime);\n+ }\n+}\n+\n+function getTargetMIME(inputMIME: string): ResultMIME {\n+ const config = mediaConfig[inputMIME];\n+ if (!config) {\n+ return 'image/jpeg';\n+ }\n+ const targetMIME = config.imageConfig && config.imageConfig.convertTo;\n+ if (targetMIME) {\n+ return targetMIME;\n+ }\n+ invariant(\n+ inputMIME === 'image/png' || inputMIME === 'image/jpeg',\n+ 'all images must be converted to jpeg or png',\n+ );\n+ return inputMIME;\n+}\nconst bytesNeededForFileTypeCheck = 64;\n@@ -44,7 +128,10 @@ function fileInfoFromData(\nreturn { mime: null, mediaType: null };\n}\nconst { mime } = fileTypeResult;\n- const mediaType = mimeTypesToMediaTypes[mime];\n+\n+ const rawMediaType = mediaConfig[mime] && mediaConfig[mime].mediaType;\n+ const mediaType = rawMediaType === 'photo_or_video' ? 'photo' : rawMediaType;\n+\nreturn { mime, mediaType };\n}\n@@ -61,7 +148,7 @@ function replaceExtension(filename: string, ext: string): string {\n}\nfunction readableFilename(filename: string, mime: string): ?string {\n- const ext = mimeTypesToExtensions[mime];\n+ const ext = mediaConfig[mime] && mediaConfig[mime].extension;\nif (!ext) {\nreturn null;\n}\n@@ -100,11 +187,13 @@ function filenameFromPathOrURI(pathOrURI: string): ?string {\n}\nexport {\n+ mediaConfig,\n+ serverTranscodableTypes,\n+ getTargetMIME,\nbytesNeededForFileTypeCheck,\nfileInfoFromData,\nreplaceExtension,\nreadableFilename,\n- mimeTypesToMediaTypes,\nextensionFromFilename,\npathFromURI,\nfilenameFromPathOrURI,\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/utils/image-utils.js",
"new_path": "lib/utils/image-utils.js",
"diff": "import type { Dimensions } from '../types/media-types';\n+import { getTargetMIME } from './file-utils';\nimport { maxDimensions } from './media-utils';\nconst { height: maxHeight, width: maxWidth } = maxDimensions;\n-const convertToPNG = new Set([\n- 'image/png',\n- 'image/gif',\n- 'image/svg+xml',\n- 'image/bmp',\n-]);\ntype Input = {|\ninputMIME: string,\n@@ -44,7 +39,8 @@ function getImageProcessingPlan(input: Input): ?Plan {\nreturn null;\n}\n- const targetMIME = convertToPNG.has(inputMIME) ? 'image/png' : 'image/jpeg';\n+ const targetMIME = getTargetMIME(inputMIME);\n+\nlet compressionRatio = 1;\nif (targetMIME === 'image/jpeg') {\nif (needsCompression) {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/media/file-utils.js",
"new_path": "native/media/file-utils.js",
"diff": "@@ -19,6 +19,7 @@ import base64 from 'base-64';\nimport invariant from 'invariant';\nimport {\n+ mediaConfig,\npathFromURI,\nfileInfoFromData,\nbytesNeededForFileTypeCheck,\n@@ -289,7 +290,7 @@ async function getMediaTypeInfo(\nsteps: $ReadOnlyArray<MediaMissionStep>,\nresult: ?MediaType,\n|}> {\n- if (mime !== 'image/gif') {\n+ if (!mediaConfig[mime] || mediaConfig[mime].mediaType !== 'photo_or_video') {\nreturn { steps: [], result: baseMediaType };\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/media/video-utils.js",
"new_path": "native/media/video-utils.js",
"diff": "@@ -11,7 +11,7 @@ import filesystem from 'react-native-fs';\nimport { Platform } from 'react-native';\nimport invariant from 'invariant';\n-import { pathFromURI } from 'lib/utils/file-utils';\n+import { mediaConfig, pathFromURI } from 'lib/utils/file-utils';\nimport {\ngetVideoProcessingPlan,\nvideoDurationLimit,\n@@ -140,6 +140,11 @@ async function processVideo(\nconst dimensions = transcodeProbeStep.dimensions\n? transcodeProbeStep.dimensions\n: input.dimensions;\n+ const loop = !!(\n+ mediaConfig[input.mime] &&\n+ mediaConfig[input.mime].videoConfig &&\n+ mediaConfig[input.mime].videoConfig.loop\n+ );\nreturn {\nsteps,\nresult: {\n@@ -147,7 +152,7 @@ async function processVideo(\nuri: `file://${outputPath}`,\nmime: 'video/mp4',\ndimensions,\n- loop: input.mime === 'image/gif',\n+ loop,\n},\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/uploads/media-utils.js",
"new_path": "server/src/uploads/media-utils.js",
"diff": "@@ -7,21 +7,14 @@ import sharp from 'sharp';\nimport invariant from 'invariant';\nimport bmp from '@vingle/bmp-js';\n-import { readableFilename } from 'lib/utils/file-utils';\n+import {\n+ serverTranscodableTypes,\n+ readableFilename,\n+} from 'lib/utils/file-utils';\nimport { getImageProcessingPlan } from 'lib/utils/image-utils';\nimport { deepFileInfoFromData } from 'web/media/file-utils';\n-const allowedMimeTypes = new Set([\n- 'image/png',\n- 'image/jpeg',\n- 'image/gif',\n- 'image/webp',\n- 'image/tiff',\n- 'image/svg+xml',\n- 'image/bmp',\n-]);\n-\nfunction initializeSharp(buffer: Buffer, mime: string) {\nif (mime !== 'image/bmp') {\nreturn sharp(buffer);\n@@ -47,7 +40,7 @@ async function validateAndConvert(\nif (!mime || !mediaType) {\nreturn null;\n}\n- if (!allowedMimeTypes.has(mime)) {\n+ if (!serverTranscodableTypes.has(mime)) {\n// This should've gotten converted on the client\nreturn null;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "web/media/file-utils.js",
"new_path": "web/media/file-utils.js",
"diff": "import type { DetermineFileTypeMediaMissionStep } from 'lib/types/media-types';\nimport isSvg from 'is-svg';\n+import invariant from 'invariant';\nimport {\n+ mediaConfig,\n+ serverTranscodableTypes,\nfileInfoFromData,\ntype FileDataInfo,\n- mimeTypesToMediaTypes,\nreadableFilename,\n} from 'lib/utils/file-utils';\nimport { getMessageForException } from 'lib/utils/errors';\n@@ -22,7 +24,9 @@ function deepFileInfoFromData(data: Buffer | ArrayBuffer): FileDataInfo {\nreturn result;\n}\nconst mime = 'image/svg+xml';\n- return { mime, mediaType: mimeTypesToMediaTypes[mime] };\n+ const mediaType = mediaConfig[mime] && mediaConfig[mime].mediaType;\n+ invariant(mediaType !== 'photo_or_video', 'svg should be considered a photo');\n+ return { mime, mediaType };\n}\nfunction determineFileType(\n@@ -37,7 +41,7 @@ function determineFileType(\nexceptionMessage = getMessageForException(e);\n}\n- if (!mime || !mediaType || !allowedMimeTypes.has(mime)) {\n+ if (!mime || !mediaType || !serverTranscodableTypes.has(mime)) {\nreturn {\nstep: 'determine_file_type',\nsuccess: false,\n@@ -63,16 +67,6 @@ function determineFileType(\n};\n}\n-const allowedMimeTypeArray = [\n- 'image/png',\n- 'image/jpeg',\n- 'image/gif',\n- 'image/webp',\n- 'image/tiff',\n- 'image/svg+xml',\n- 'image/bmp',\n-];\n-const allowedMimeTypes = new Set(allowedMimeTypeArray);\n-const allowedMimeTypeString = allowedMimeTypeArray.join(',');\n+const allowedMimeTypeString = [...serverTranscodableTypes].join(',');\nexport { deepFileInfoFromData, determineFileType, allowedMimeTypeString };\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Centralize config for MIME types in one place |
129,187 | 05.05.2020 15:31:28 | 14,400 | 72c7011941b55f434866a50db6901cc37d869999 | [web] Include error when failing to render image | [
{
"change_type": "MODIFY",
"old_path": "web/media/media-utils.js",
"new_path": "web/media/media-utils.js",
"diff": "@@ -31,7 +31,9 @@ async function preloadImage(\nimg.onload = () => {\nresolve(img);\n};\n- img.onerror = reject;\n+ img.onerror = e => {\n+ reject(e);\n+ };\n});\n} catch (e) {\nexceptionMessage = getMessageForException(e);\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [web] Include error when failing to render image |
129,187 | 05.05.2020 17:11:41 | 14,400 | 99bf0a32a2fb6e9c3b1eddebe7e34bcc20725582 | Allow upload of media types browser doesn't support
(As long as the server can transcode them) | [
{
"change_type": "MODIFY",
"old_path": "lib/actions/upload-actions.js",
"new_path": "lib/actions/upload-actions.js",
"diff": "@@ -21,13 +21,16 @@ async function uploadMultimedia(\nconst abortHandler = callbacks && callbacks.abortHandler;\nconst uploadBlob = callbacks && callbacks.uploadBlob;\n- const stringDimensions = {\n- height: extras.height.toString(),\n- width: extras.width.toString(),\n- };\n- const stringExtras = extras.loop\n- ? { ...stringDimensions, loop: '1' }\n- : stringDimensions;\n+ const stringExtras = {};\n+ if (extras.height !== null && extras.height !== undefined) {\n+ stringExtras.height = extras.height.toString();\n+ }\n+ if (extras.width !== null && extras.width !== undefined) {\n+ stringExtras.width = extras.width.toString();\n+ }\n+ if (extras.loop) {\n+ stringExtras.loop = '1';\n+ }\nconst response = await fetchJSON(\n'upload_multimedia',\n"
},
{
"change_type": "MODIFY",
"old_path": "lib/types/media-types.js",
"new_path": "lib/types/media-types.js",
"diff": "@@ -508,10 +508,6 @@ export type MediaMissionFailure =\nsuccess: false,\nreason: 'exif_fetch_failed',\n|}\n- | {|\n- success: false,\n- reason: 'preload_image_failed',\n- |}\n| {|\nsuccess: false,\nreason: 'reorient_image_failed',\n@@ -872,10 +868,6 @@ export const mediaMissionPropType = PropTypes.shape({\nsuccess: PropTypes.oneOf([false]).isRequired,\nreason: PropTypes.oneOf(['exif_fetch_failed']).isRequired,\n}),\n- PropTypes.shape({\n- success: PropTypes.oneOf([false]).isRequired,\n- reason: PropTypes.oneOf(['preload_image_failed']).isRequired,\n- }),\nPropTypes.shape({\nsuccess: PropTypes.oneOf([false]).isRequired,\nreason: PropTypes.oneOf(['reorient_image_failed']).isRequired,\n"
},
{
"change_type": "MODIFY",
"old_path": "web/input/input-state-container.react.js",
"new_path": "web/input/input-state-container.react.js",
"diff": "@@ -191,19 +191,29 @@ class InputStateContainer extends React.PureComponent<Props, State> {\ninvariant(creatorID, 'need viewer ID in order to send a message');\nconst media = uploads.map(\n({ localID, serverID, uri, mediaType, dimensions, loop }) => {\n+ // We can get into this state where dimensions are null if the user is\n+ // uploading a file type that the browser can't render. In that case\n+ // we fake the dimensions here while we wait for the server to tell us\n+ // the true dimensions. We actually don't use the dimensions on the\n+ // web side currently, but if we ever change that (for instance if we\n+ // want to render a properly sized loading overlay like we do on\n+ // native), 0,0 is probably a good default.\n+ const shimmedDimensions = dimensions\n+ ? dimensions\n+ : { height: 0, width: 0 };\nif (mediaType === 'photo') {\nreturn {\nid: serverID ? serverID : localID,\nuri,\ntype: 'photo',\n- dimensions,\n+ dimensions: shimmedDimensions,\n};\n} else {\nreturn {\nid: serverID ? serverID : localID,\nuri,\ntype: 'video',\n- dimensions,\n+ dimensions: shimmedDimensions,\nloop,\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "web/input/input-state.js",
"new_path": "web/input/input-state.js",
"diff": "@@ -23,7 +23,7 @@ export type PendingMultimediaUpload = {|\nfailed: ?string,\nfile: File,\nmediaType: MediaType,\n- dimensions: Dimensions,\n+ dimensions: ?Dimensions,\nuri: string,\nloop: boolean,\n// URLs created with createObjectURL aren't considered \"real\". The distinction\n@@ -43,7 +43,7 @@ const pendingMultimediaUploadPropType = PropTypes.shape({\nfailed: PropTypes.string,\nfile: PropTypes.object.isRequired,\nmediaType: mediaTypePropType.isRequired,\n- dimensions: dimensionsPropType.isRequired,\n+ dimensions: dimensionsPropType,\nuri: PropTypes.string.isRequired,\nloop: PropTypes.bool.isRequired,\nuriIsReal: PropTypes.bool.isRequired,\n"
},
{
"change_type": "MODIFY",
"old_path": "web/media/media-utils.js",
"new_path": "web/media/media-utils.js",
"diff": "@@ -12,15 +12,11 @@ import { getMessageForException } from 'lib/utils/errors';\nimport { probeFile } from './blob-utils';\nimport { getOrientation } from './image-utils';\n-type PreloadImageSuccess = {|\n- success: true,\n- image: Image,\n-|};\nasync function preloadImage(\nuri: string,\n): Promise<{|\nsteps: $ReadOnlyArray<MediaMissionStep>,\n- result: MediaMissionFailure | PreloadImageSuccess,\n+ result: ?Image,\n|}> {\nlet image, exceptionMessage;\nconst start = Date.now();\n@@ -38,9 +34,6 @@ async function preloadImage(\n} catch (e) {\nexceptionMessage = getMessageForException(e);\n}\n- const result = image\n- ? { success: true, image }\n- : { success: false, reason: 'preload_image_failed' };\nconst dimensions = image\n? { height: image.height, width: image.width }\n: null;\n@@ -52,13 +45,13 @@ async function preloadImage(\nuri,\ndimensions,\n};\n- return { steps: [step], result };\n+ return { steps: [step], result: image };\n}\ntype ProcessFileSuccess = {|\nsuccess: true,\nuri: string,\n- dimensions: Dimensions,\n+ dimensions: ?Dimensions,\n|};\nasync function processFile(\nfile: File,\n@@ -70,11 +63,11 @@ async function processFile(\nconst initialURI = URL.createObjectURL(file);\nif (!exifRotate) {\nconst { steps, result } = await preloadImage(initialURI);\n- if (!result.success) {\n- return { steps, result };\n+ let dimensions;\n+ if (result) {\n+ const { width, height } = result;\n+ dimensions = { width, height };\n}\n- const { width, height } = result.image;\n- const dimensions = { width, height };\nreturn { steps, result: { success: true, uri: initialURI, dimensions } };\n}\n@@ -82,14 +75,16 @@ async function processFile(\npreloadImage(initialURI),\ngetOrientation(file),\n]);\n- const { steps: preloadSteps, result: preloadResult } = preloadResponse;\n+ const { steps: preloadSteps, result: image } = preloadResponse;\nconst steps = [...preloadSteps, orientationStep];\n- if (!preloadResult.success) {\n- return { steps, result: preloadResult };\n+ if (!image) {\n+ return {\n+ steps,\n+ result: { success: true, uri: initialURI, dimensions: undefined },\n+ };\n}\n- const { image } = preloadResult;\nif (!orientationStep.success) {\nreturn { steps, result: { success: false, reason: 'exif_fetch_failed' } };\n@@ -161,7 +156,7 @@ type FileValidationSuccess = {|\nfile: File,\nmediaType: MediaType,\nuri: string,\n- dimensions: Dimensions,\n+ dimensions: ?Dimensions,\n|};\nasync function validateFile(\nfile: File,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Allow upload of media types browser doesn't support
(As long as the server can transcode them) |
129,187 | 05.05.2020 17:45:51 | 14,400 | 4a9da9e737f088477ecce11611240374288096b1 | New lib/media folder | [
{
"change_type": "RENAME",
"old_path": "lib/utils/file-utils.js",
"new_path": "lib/media/file-utils.js",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "lib/utils/image-utils.js",
"new_path": "lib/media/image-utils.js",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "lib/utils/media-utils.js",
"new_path": "lib/media/media-utils.js",
"diff": ""
},
{
"change_type": "RENAME",
"old_path": "lib/utils/video-utils.js",
"new_path": "lib/media/video-utils.js",
"diff": "@@ -5,8 +5,8 @@ import type { Dimensions } from '../types/media-types';\nimport invariant from 'invariant';\nimport { replaceExtension } from './file-utils';\n-import { getUUID } from './uuid';\nimport { maxDimensions } from './media-utils';\n+import { getUUID } from '../utils/uuid';\nconst { height: maxHeight, width: maxWidth } = maxDimensions;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/input/input-state-container.react.js",
"new_path": "native/input/input-state-container.react.js",
"diff": "@@ -59,9 +59,9 @@ import {\ncreateLoadingStatusSelector,\ncombineLoadingStatuses,\n} from 'lib/selectors/loading-selectors';\n-import { pathFromURI } from 'lib/utils/file-utils';\n+import { pathFromURI } from 'lib/media/file-utils';\nimport { isStaff } from 'lib/shared/user-utils';\n-import { videoDurationLimit } from 'lib/utils/video-utils';\n+import { videoDurationLimit } from 'lib/media/video-utils';\nimport { getMessageForException } from 'lib/utils/errors';\nimport {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/media/blob-utils.js",
"new_path": "native/media/blob-utils.js",
"diff": "@@ -11,7 +11,7 @@ import invariant from 'invariant';\nimport {\nfileInfoFromData,\nbytesNeededForFileTypeCheck,\n-} from 'lib/utils/file-utils';\n+} from 'lib/media/file-utils';\nimport { getMessageForException } from 'lib/utils/errors';\nimport { getFetchableURI } from './identifier-utils';\n"
},
{
"change_type": "MODIFY",
"old_path": "native/media/camera-modal.react.js",
"new_path": "native/media/camera-modal.react.js",
"diff": "@@ -50,7 +50,7 @@ import invariant from 'invariant';\nimport filesystem from 'react-native-fs';\nimport { connect } from 'lib/utils/redux-utils';\n-import { pathFromURI, filenameFromPathOrURI } from 'lib/utils/file-utils';\n+import { pathFromURI, filenameFromPathOrURI } from 'lib/media/file-utils';\nimport {\ncontentBottomOffset,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/media/ffmpeg.js",
"new_path": "native/media/ffmpeg.js",
"diff": "import { RNFFmpeg, RNFFprobe, RNFFmpegConfig } from 'react-native-ffmpeg';\n-import { getHasMultipleFramesProbeCommand } from 'lib/utils/video-utils';\n+import { getHasMultipleFramesProbeCommand } from 'lib/media/video-utils';\nif (!__DEV__) {\nRNFFmpegConfig.disableLogs();\n"
},
{
"change_type": "MODIFY",
"old_path": "native/media/file-utils.js",
"new_path": "native/media/file-utils.js",
"diff": "@@ -23,7 +23,7 @@ import {\npathFromURI,\nfileInfoFromData,\nbytesNeededForFileTypeCheck,\n-} from 'lib/utils/file-utils';\n+} from 'lib/media/file-utils';\nimport { getMessageForException } from 'lib/utils/errors';\nimport { stringToIntArray } from './blob-utils';\n"
},
{
"change_type": "MODIFY",
"old_path": "native/media/image-utils.js",
"new_path": "native/media/image-utils.js",
"diff": "@@ -8,7 +8,7 @@ import type {\nimport * as ImageManipulator from 'expo-image-manipulator';\n-import { getImageProcessingPlan } from 'lib/utils/image-utils';\n+import { getImageProcessingPlan } from 'lib/media/image-utils';\nimport { getMessageForException } from 'lib/utils/errors';\ntype ProcessImageInfo = {|\n"
},
{
"change_type": "MODIFY",
"old_path": "native/media/media-gallery-keyboard.react.js",
"new_path": "native/media/media-gallery-keyboard.react.js",
"diff": "@@ -24,7 +24,7 @@ import PropTypes from 'prop-types';\nimport * as MediaLibrary from 'expo-media-library';\nimport { connect } from 'lib/utils/redux-utils';\n-import { extensionFromFilename } from 'lib/utils/file-utils';\n+import { extensionFromFilename } from 'lib/media/file-utils';\nimport sleep from 'lib/utils/sleep';\nimport { store } from '../redux/redux-setup';\n"
},
{
"change_type": "MODIFY",
"old_path": "native/media/media-utils.js",
"new_path": "native/media/media-utils.js",
"diff": "@@ -11,7 +11,7 @@ import type {\nimport { Image } from 'react-native';\nimport invariant from 'invariant';\n-import { pathFromURI, readableFilename } from 'lib/utils/file-utils';\n+import { pathFromURI, readableFilename } from 'lib/media/file-utils';\nimport { fetchFileInfo } from './file-utils';\nimport { processVideo } from './video-utils';\n"
},
{
"change_type": "MODIFY",
"old_path": "native/media/save-media.js",
"new_path": "native/media/save-media.js",
"diff": "@@ -14,7 +14,7 @@ import { Platform, PermissionsAndroid } from 'react-native';\nimport filesystem from 'react-native-fs';\nimport * as MediaLibrary from 'expo-media-library';\n-import { readableFilename, pathFromURI } from 'lib/utils/file-utils';\n+import { readableFilename, pathFromURI } from 'lib/media/file-utils';\nimport { promiseAll } from 'lib/utils/promises';\nimport { getMessageForException } from 'lib/utils/errors';\nimport { getConfig } from 'lib/utils/config';\n"
},
{
"change_type": "MODIFY",
"old_path": "native/media/video-utils.js",
"new_path": "native/media/video-utils.js",
"diff": "@@ -11,11 +11,11 @@ import filesystem from 'react-native-fs';\nimport { Platform } from 'react-native';\nimport invariant from 'invariant';\n-import { mediaConfig, pathFromURI } from 'lib/utils/file-utils';\n+import { mediaConfig, pathFromURI } from 'lib/media/file-utils';\nimport {\ngetVideoProcessingPlan,\nvideoDurationLimit,\n-} from 'lib/utils/video-utils';\n+} from 'lib/media/video-utils';\nimport { getMessageForException } from 'lib/utils/errors';\nimport { ffmpeg } from './ffmpeg';\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/uploads/media-utils.js",
"new_path": "server/src/uploads/media-utils.js",
"diff": "@@ -10,8 +10,8 @@ import bmp from '@vingle/bmp-js';\nimport {\nserverTranscodableTypes,\nreadableFilename,\n-} from 'lib/utils/file-utils';\n-import { getImageProcessingPlan } from 'lib/utils/image-utils';\n+} from 'lib/media/file-utils';\n+import { getImageProcessingPlan } from 'lib/media/image-utils';\nimport { deepFileInfoFromData } from 'web/media/file-utils';\n"
},
{
"change_type": "MODIFY",
"old_path": "web/media/file-utils.js",
"new_path": "web/media/file-utils.js",
"diff": "@@ -11,7 +11,7 @@ import {\nfileInfoFromData,\ntype FileDataInfo,\nreadableFilename,\n-} from 'lib/utils/file-utils';\n+} from 'lib/media/file-utils';\nimport { getMessageForException } from 'lib/utils/errors';\nfunction deepFileInfoFromData(data: Buffer | ArrayBuffer): FileDataInfo {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | New lib/media folder |
129,187 | 06.05.2020 12:49:59 | 14,400 | ef433d1412e5f56cc4f0587955d07be4663b4c80 | [native] Reduce component depth of RemoteImage
It's more readable now and results in a shallower draw stack on Android | [
{
"change_type": "MODIFY",
"old_path": "native/media/remote-image.react.js",
"new_path": "native/media/remote-image.react.js",
"diff": "@@ -56,23 +56,34 @@ class RemoteImage extends React.PureComponent<Props, State> {\n}\nrender() {\n- let spinner = null;\n- if (!this.state.loaded && !this.props.invisibleLoad) {\n- spinner = (\n- <View style={styles.spinnerContainer}>\n- <ActivityIndicator color={this.props.spinnerColor} size=\"large\" />\n- </View>\n+ const source = { uri: this.props.uri };\n+ if (this.state.loaded) {\n+ return (\n+ <FastImage\n+ source={source}\n+ onLoad={this.onLoad}\n+ style={this.props.style}\n+ key={this.state.attempt}\n+ />\n);\n}\n- const source = { uri: this.props.uri };\n- const containerStyle =\n- !this.state.loaded && this.props.invisibleLoad\n- ? styles.invisibleContainer\n- : styles.container;\n+ if (this.props.invisibleLoad) {\nreturn (\n- <View style={containerStyle}>\n- {spinner}\n+ <FastImage\n+ source={source}\n+ onLoad={this.onLoad}\n+ style={[this.props.style, styles.invisible]}\n+ key={this.state.attempt}\n+ />\n+ );\n+ }\n+\n+ return (\n+ <View style={styles.container}>\n+ <View style={styles.spinnerContainer}>\n+ <ActivityIndicator color={this.props.spinnerColor} size=\"large\" />\n+ </View>\n<FastImage\nsource={source}\nonLoad={this.onLoad}\n@@ -92,8 +103,7 @@ const styles = StyleSheet.create({\ncontainer: {\nflex: 1,\n},\n- invisibleContainer: {\n- flex: 1,\n+ invisible: {\nopacity: 0,\n},\nspinnerContainer: {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Reduce component depth of RemoteImage
It's more readable now and results in a shallower draw stack on Android |
129,187 | 06.05.2020 12:51:10 | 14,400 | 001674b37bfab55f34b4ce5f50fec45253cd0b18 | [native] Simplify some Message styles
The goal was to reduce draw stack depth on Android. These don't accomplish that, but since it's simpler let's keep it | [
{
"change_type": "MODIFY",
"old_path": "native/chat/composed-message.react.js",
"new_path": "native/chat/composed-message.react.js",
"diff": "@@ -91,9 +91,7 @@ class ComposedMessage extends React.PureComponent<Props> {\n<MessageHeader item={item} focused={focused} display=\"lowContrast\" />\n<View style={containerStyle}>\n<View style={[styles.content, alignStyle]}>\n- <View style={[styles.messageBox, messageBoxStyle, alignStyle]}>\n- {children}\n- </View>\n+ <View style={[styles.messageBox, messageBoxStyle]}>{children}</View>\n{deliveryIcon}\n</View>\n{failedSendInfo}\n@@ -124,7 +122,6 @@ const styles = StyleSheet.create({\njustifyContent: 'flex-start',\n},\nmessageBox: {\n- flexDirection: 'row',\nmarginRight: 5,\n},\nrightChatBubble: {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/inline-multimedia.react.js",
"new_path": "native/chat/inline-multimedia.react.js",
"diff": "@@ -74,13 +74,11 @@ class InlineMultimedia extends React.PureComponent<Props> {\nonLongPress={this.props.onLongPress}\nstyle={styles.expand}\n>\n- <View style={styles.expand}>\n<Multimedia\nmediaInfo={mediaInfo}\nspinnerColor={this.props.spinnerColor}\n/>\n{progressIndicator}\n- </View>\n</TouchableOpacity>\n);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/multimedia-message.react.js",
"new_path": "native/chat/multimedia-message.react.js",
"diff": "@@ -174,9 +174,7 @@ class MultimediaMessage extends React.PureComponent<Props> {\nfocused={focused}\n{...viewProps}\n>\n- <View style={[containerStyle, styles.container]}>\n- {this.renderContent()}\n- </View>\n+ <View style={containerStyle}>{this.renderContent()}</View>\n</ComposedMessage>\n);\n}\n@@ -282,10 +280,6 @@ class MultimediaMessage extends React.PureComponent<Props> {\nconst spaceBetweenImages = 4;\nconst styles = StyleSheet.create({\n- container: {\n- flexDirection: 'row',\n- justifyContent: 'center',\n- },\nfiller: {\nflex: 1,\n},\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Simplify some Message styles
The goal was to reduce draw stack depth on Android. These don't accomplish that, but since it's simpler let's keep it |
129,187 | 05.05.2020 18:20:03 | 14,400 | 1950bf00f64586ef121a5970bad9362b06202baa | [native] codeVersion -> 49 | [
{
"change_type": "MODIFY",
"old_path": "native/android/app/build.gradle",
"new_path": "native/android/app/build.gradle",
"diff": "@@ -132,8 +132,8 @@ android {\napplicationId \"org.squadcal\"\nminSdkVersion rootProject.ext.minSdkVersion\ntargetSdkVersion rootProject.ext.targetSdkVersion\n- versionCode 48\n- versionName \"0.0.48\"\n+ versionCode 49\n+ versionName \"0.0.49\"\nmissingDimensionStrategy 'react-native-camera', 'general'\nmultiDexEnabled true\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/ios/SquadCal/Info.debug.plist",
"new_path": "native/ios/SquadCal/Info.debug.plist",
"diff": "<key>CFBundlePackageType</key>\n<string>APPL</string>\n<key>CFBundleShortVersionString</key>\n- <string>0.0.48</string>\n+ <string>0.0.49</string>\n<key>CFBundleSignature</key>\n<string>????</string>\n<key>CFBundleVersion</key>\n- <string>48</string>\n+ <string>49</string>\n<key>LSApplicationQueriesSchemes</key>\n<array>\n<string>org-appextension-feature-password-management</string>\n"
},
{
"change_type": "MODIFY",
"old_path": "native/ios/SquadCal/Info.release.plist",
"new_path": "native/ios/SquadCal/Info.release.plist",
"diff": "<key>CFBundlePackageType</key>\n<string>APPL</string>\n<key>CFBundleShortVersionString</key>\n- <string>0.0.48</string>\n+ <string>0.0.49</string>\n<key>CFBundleSignature</key>\n<string>????</string>\n<key>CFBundleVersion</key>\n- <string>48</string>\n+ <string>49</string>\n<key>LSApplicationQueriesSchemes</key>\n<array>\n<string>org-appextension-feature-password-management</string>\n"
},
{
"change_type": "MODIFY",
"old_path": "native/redux/persist.js",
"new_path": "native/redux/persist.js",
"diff": "@@ -178,7 +178,7 @@ const persistConfig = {\ntimeout: __DEV__ ? 0 : undefined,\n};\n-const codeVersion = 48;\n+const codeVersion = 49;\n// This local exists to avoid a circular dependency where redux-setup needs to\n// import all the navigation and screen stuff, but some of those screens want to\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] codeVersion -> 49 |
129,187 | 06.05.2020 17:46:21 | 14,400 | 7de2c3efff4609587b97133e3a6cf69b028857de | [native] OverlayContext | [
{
"change_type": "MODIFY",
"old_path": "native/chat/multimedia-message-multimedia.react.js",
"new_path": "native/chat/multimedia-message-multimedia.react.js",
"diff": "@@ -35,6 +35,7 @@ import * as React from 'react';\nimport PropTypes from 'prop-types';\nimport { View, StyleSheet } from 'react-native';\nimport Animated from 'react-native-reanimated';\n+import invariant from 'invariant';\nimport { messageKey } from 'lib/shared/message-utils';\nimport { chatMessageItemPropType } from 'lib/selectors/chat-selectors';\n@@ -43,6 +44,11 @@ import { connect } from 'lib/utils/redux-utils';\nimport InlineMultimedia from './inline-multimedia.react';\nimport { multimediaTooltipHeight } from './multimedia-tooltip-modal.react';\nimport { type Colors, colorsPropType, colorsSelector } from '../themes/colors';\n+import {\n+ withOverlayContext,\n+ type OverlayContextType,\n+ overlayContextPropType,\n+} from '../navigation/overlay-navigator.react';\n/* eslint-disable import/no-named-as-default-member */\nconst {\n@@ -77,7 +83,6 @@ type Props = {|\nverticalBounds: ?VerticalBounds,\nverticalOffset: number,\nstyle: ImageStyle,\n- overlayPosition: ?Value,\npostInProgress: boolean,\npendingUpload: ?PendingMultimediaUpload,\nmessageFocused: boolean,\n@@ -88,6 +93,8 @@ type Props = {|\nscrollViewModalState: ?ScrollViewModalState,\n// withKeyboardState\nkeyboardState: ?KeyboardState,\n+ // withOverlayContext\n+ overlayContext: ?OverlayContextType,\n|};\nclass MultimediaMessageMultimedia extends React.PureComponent<Props> {\nstatic propTypes = {\n@@ -96,7 +103,6 @@ class MultimediaMessageMultimedia extends React.PureComponent<Props> {\nnavigation: messageListNavPropType.isRequired,\nverticalBounds: verticalBoundsPropType,\nverticalOffset: PropTypes.number.isRequired,\n- overlayPosition: PropTypes.instanceOf(Value),\npostInProgress: PropTypes.bool.isRequired,\npendingUpload: pendingMultimediaUploadPropType,\nmessageFocused: PropTypes.bool.isRequired,\n@@ -104,6 +110,7 @@ class MultimediaMessageMultimedia extends React.PureComponent<Props> {\ncolors: colorsPropType.isRequired,\nscrollViewModalState: scrollViewModalStatePropType,\nkeyboardState: keyboardStatePropType,\n+ overlayContext: overlayContextPropType,\n};\nview: ?View;\nclickable = true;\n@@ -115,10 +122,21 @@ class MultimediaMessageMultimedia extends React.PureComponent<Props> {\nthis.getOpacity();\n}\n+ static getOverlayPosition(props: Props) {\n+ const { overlayContext } = props;\n+ invariant(\n+ overlayContext,\n+ 'MultimediaMessageMultimedia should have OverlayContext',\n+ );\n+ return overlayContext.position;\n+ }\n+\ngetOpacity() {\n- const { overlayPosition } = this.props;\n+ const overlayPosition = MultimediaMessageMultimedia.getOverlayPosition(\n+ this.props,\n+ );\nif (!overlayPosition) {\n- return null;\n+ return;\n}\nthis.opacity = block([\ncond(overlayJustCleared(overlayPosition), set(this.hidden, 0)),\n@@ -144,7 +162,13 @@ class MultimediaMessageMultimedia extends React.PureComponent<Props> {\n}\ncomponentDidUpdate(prevProps: Props) {\n- if (this.props.overlayPosition !== prevProps.overlayPosition) {\n+ const overlayPosition = MultimediaMessageMultimedia.getOverlayPosition(\n+ this.props,\n+ );\n+ const prevOverlayPosition = MultimediaMessageMultimedia.getOverlayPosition(\n+ prevProps,\n+ );\n+ if (overlayPosition !== prevOverlayPosition) {\nthis.getOpacity();\n}\n@@ -319,4 +343,8 @@ const styles = StyleSheet.create({\nexport default connect((state: AppState) => ({\ncolors: colorsSelector(state),\n-}))(withKeyboardState(withScrollViewModalState(MultimediaMessageMultimedia)));\n+}))(\n+ withOverlayContext(\n+ withKeyboardState(withScrollViewModalState(MultimediaMessageMultimedia)),\n+ ),\n+);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/multimedia-message.react.js",
"new_path": "native/chat/multimedia-message.react.js",
"diff": "@@ -22,11 +22,9 @@ import * as React from 'react';\nimport { StyleSheet, View } from 'react-native';\nimport PropTypes from 'prop-types';\nimport invariant from 'invariant';\n-import Animated from 'react-native-reanimated';\nimport { ComposedMessage, clusterEndHeight } from './composed-message.react';\nimport MultimediaMessageMultimedia from './multimedia-message-multimedia.react';\n-import { withOverlayPositionContext } from '../navigation/overlay-navigator.react';\nimport {\nallCorners,\nfilterCorners,\n@@ -138,8 +136,6 @@ type Props = {|\nfocused: boolean,\ntoggleFocus: (messageKey: string) => void,\nverticalBounds: ?VerticalBounds,\n- // withOverlayPositionContext\n- overlayPosition: ?Animated.Value,\n...React.ElementProps<typeof View>,\n|};\nclass MultimediaMessage extends React.PureComponent<Props> {\n@@ -149,8 +145,6 @@ class MultimediaMessage extends React.PureComponent<Props> {\nfocused: PropTypes.bool.isRequired,\ntoggleFocus: PropTypes.func.isRequired,\nverticalBounds: verticalBoundsPropType,\n- // eslint-disable-next-line import/no-named-as-default-member\n- overlayPosition: PropTypes.instanceOf(Animated.Value),\n};\nrender() {\n@@ -160,7 +154,6 @@ class MultimediaMessage extends React.PureComponent<Props> {\nfocused,\ntoggleFocus,\nverticalBounds,\n- overlayPosition,\n...viewProps\n} = this.props;\nconst containerStyle = {\n@@ -266,7 +259,6 @@ class MultimediaMessage extends React.PureComponent<Props> {\nverticalBounds={this.props.verticalBounds}\nverticalOffset={verticalOffset}\nstyle={[style, roundedStyle]}\n- overlayPosition={this.props.overlayPosition}\npostInProgress={!!pendingUploads}\npendingUpload={pendingUpload}\nmessageFocused={this.props.focused}\n@@ -300,11 +292,9 @@ const styles = StyleSheet.create({\n},\n});\n-const WrappedMultimediaMessage = withOverlayPositionContext(MultimediaMessage);\n-\nexport {\nborderRadius as multimediaMessageBorderRadius,\n- WrappedMultimediaMessage as MultimediaMessage,\n+ MultimediaMessage,\nmultimediaMessageContentSizes,\nmultimediaMessageItemHeight,\nsendFailed as multimediaMessageSendFailed,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/media/camera-modal.react.js",
"new_path": "native/media/camera-modal.react.js",
"diff": "import type {\nNavigationStackProp,\nNavigationLeafRoute,\n- NavigationStackScene,\n- NavigationStackTransitionProps,\n} from 'react-navigation-stack';\nimport type { AppState } from '../redux/redux-setup';\nimport {\n@@ -62,6 +60,11 @@ import { clamp, gestureJustEnded } from '../utils/animation-utils';\nimport ContentLoading from '../components/content-loading.react';\nimport { colors } from '../themes/colors';\nimport SendMediaButton from './send-media-button.react';\n+import {\n+ withOverlayContext,\n+ type OverlayContextType,\n+ overlayContextPropType,\n+} from '../navigation/overlay-navigator.react';\n/* eslint-disable import/no-named-as-default-member */\nconst {\n@@ -236,19 +239,18 @@ type TouchableOpacityInstance = React.AbstractComponent<\ntype Props = {\nnavigation: NavProp,\n- scene: NavigationStackScene,\n- transitionProps: NavigationStackTransitionProps,\n- position: Value,\n// Redux state\nscreenDimensions: Dimensions,\ncontentVerticalOffset: number,\ndeviceCameraInfo: DeviceCameraInfo,\ndeviceOrientation: Orientations,\nforeground: boolean,\n- // withInputState\n- inputState: ?InputState,\n// Redux dispatch functions\ndispatchActionPayload: DispatchActionPayload,\n+ // withInputState\n+ inputState: ?InputState,\n+ // withOverlayContext\n+ overlayContext: ?OverlayContextType,\n};\ntype State = {|\nzoom: number,\n@@ -269,16 +271,14 @@ class CameraModal extends React.PureComponent<Props, State> {\n}).isRequired,\ngoBack: PropTypes.func.isRequired,\n}).isRequired,\n- scene: PropTypes.object.isRequired,\n- transitionProps: PropTypes.object.isRequired,\n- position: PropTypes.instanceOf(Value).isRequired,\nscreenDimensions: dimensionsPropType.isRequired,\ncontentVerticalOffset: PropTypes.number.isRequired,\ndeviceCameraInfo: deviceCameraInfoPropType.isRequired,\ndeviceOrientation: PropTypes.string.isRequired,\nforeground: PropTypes.bool.isRequired,\n- inputState: inputStatePropType,\ndispatchActionPayload: PropTypes.func.isRequired,\n+ inputState: inputStatePropType,\n+ overlayContext: overlayContextPropType,\n};\ncamera: ?RNCamera;\n@@ -340,10 +340,11 @@ class CameraModal extends React.PureComponent<Props, State> {\npendingPhotoCapture: undefined,\n};\n- const { position } = props;\n- const { index } = props.scene;\n+ const { overlayContext } = props;\n+ invariant(overlayContext, 'CameraModal should have OverlayContext');\n+ const { position, routeIndex } = overlayContext;\nthis.navigationProgress = interpolate(position, {\n- inputRange: [index - 1, index],\n+ inputRange: [routeIndex - 1, routeIndex],\noutputRange: [0, 1],\nextrapolate: Extrapolate.CLAMP,\n});\n@@ -534,8 +535,9 @@ class CameraModal extends React.PureComponent<Props, State> {\n}\nstatic isActive(props) {\n- const { index } = props.scene;\n- return index === props.transitionProps.index;\n+ const { overlayContext } = props;\n+ invariant(overlayContext, 'CameraModal should have OverlayContext');\n+ return !overlayContext.isDismissing;\n}\ncomponentDidMount() {\n@@ -1210,4 +1212,4 @@ export default connect(\n}),\nnull,\ntrue,\n-)(withInputState(CameraModal));\n+)(withOverlayContext(withInputState(CameraModal)));\n"
},
{
"change_type": "MODIFY",
"old_path": "native/media/multimedia-modal.react.js",
"new_path": "native/media/multimedia-modal.react.js",
"diff": "import type {\nNavigationLeafRoute,\nNavigationStackProp,\n- NavigationStackScene,\n- NavigationStackTransitionProps,\n} from 'react-navigation-stack';\nimport {\ntype MediaInfo,\n@@ -41,6 +39,7 @@ import {\nimport Orientation from 'react-native-orientation-locker';\nimport Animated, { Easing } from 'react-native-reanimated';\nimport Icon from 'react-native-vector-icons/Ionicons';\n+import invariant from 'invariant';\nimport { connect } from 'lib/utils/redux-utils';\n@@ -57,6 +56,11 @@ import {\ngestureJustEnded,\n} from '../utils/animation-utils';\nimport { intentionalSaveMedia } from './save-media';\n+import {\n+ withOverlayContext,\n+ type OverlayContextType,\n+ overlayContextPropType,\n+} from '../navigation/overlay-navigator.react';\n/* eslint-disable import/no-named-as-default-member */\nconst {\n@@ -197,12 +201,11 @@ type TouchableOpacityInstance = React.AbstractComponent<\ntype Props = {|\nnavigation: NavProp,\n- scene: NavigationStackScene,\n- transitionProps: NavigationStackTransitionProps,\n- position: Value,\n// Redux state\nscreenDimensions: Dimensions,\ncontentVerticalOffset: number,\n+ // withOverlayContext\n+ overlayContext: ?OverlayContextType,\n|};\ntype State = {|\ncloseButtonEnabled: boolean,\n@@ -221,11 +224,9 @@ class MultimediaModal extends React.PureComponent<Props, State> {\n}).isRequired,\ngoBack: PropTypes.func.isRequired,\n}).isRequired,\n- transitionProps: PropTypes.object.isRequired,\n- position: PropTypes.instanceOf(Value).isRequired,\n- scene: PropTypes.object.isRequired,\nscreenDimensions: dimensionsPropType.isRequired,\ncontentVerticalOffset: PropTypes.number.isRequired,\n+ overlayContext: overlayContextPropType,\n};\nstate = {\ncloseButtonEnabled: true,\n@@ -297,10 +298,11 @@ class MultimediaModal extends React.PureComponent<Props, State> {\nadd(top, divide(imageHeight, 2)),\n);\n- const { position } = props;\n- const { index } = props.scene;\n+ const { overlayContext } = props;\n+ invariant(overlayContext, 'MultimediaModal should have OverlayContext');\n+ const { position, routeIndex } = overlayContext;\nconst navigationProgress = interpolate(position, {\n- inputRange: [index - 1, index],\n+ inputRange: [routeIndex - 1, routeIndex],\noutputRange: [0, 1],\nextrapolate: Extrapolate.CLAMP,\n});\n@@ -1066,9 +1068,9 @@ class MultimediaModal extends React.PureComponent<Props, State> {\n}\nstatic isActive(props) {\n- const ourIndex = props.scene.index;\n- const curIndex = props.transitionProps.index;\n- return curIndex >= ourIndex;\n+ const { overlayContext } = props;\n+ invariant(overlayContext, 'MultimediaModal should have OverlayContext');\n+ return !overlayContext.isDismissing;\n}\nget contentContainerStyle() {\n@@ -1299,4 +1301,4 @@ const styles = StyleSheet.create({\nexport default connect((state: AppState) => ({\nscreenDimensions: dimensionsSelector(state),\ncontentVerticalOffset: contentVerticalOffsetSelector(state),\n-}))(MultimediaModal);\n+}))(withOverlayContext(MultimediaModal));\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/action-result-modal.react.js",
"new_path": "native/navigation/action-result-modal.react.js",
"diff": "import type {\nNavigationStackProp,\nNavigationLeafRoute,\n- NavigationStackScene,\n} from 'react-navigation';\nimport type { AppState } from '../redux/redux-setup';\nimport * as React from 'react';\nimport { View, Text } from 'react-native';\nimport Animated from 'react-native-reanimated';\n+import invariant from 'invariant';\nimport { connect } from 'lib/utils/redux-utils';\nimport { contentBottomOffset } from '../selectors/dimension-selectors';\nimport { overlayStyleSelector, type StyleSheetOf } from '../themes/colors';\nimport { connectNav, type NavContextType } from './navigation-context';\n+import { OverlayContext } from './overlay-navigator.react';\n/* eslint-disable import/no-named-as-default-member */\n-const { Value, Extrapolate, interpolate } = Animated;\n+const { Extrapolate, interpolate } = Animated;\n/* eslint-enable import/no-named-as-default-member */\ntype NavProp = NavigationStackProp<{|\n@@ -31,22 +32,21 @@ type NavProp = NavigationStackProp<{|\ntype Props = {|\nnavigation: NavProp,\n- scene: NavigationStackScene,\n- position: Value,\n// Redux state\nstyles: StyleSheetOf<typeof styles>,\n|};\nfunction ActionResultModal(props: Props) {\n- const { position, scene } = props;\n- const { index } = scene;\n+ const overlayContext = React.useContext(OverlayContext);\n+ invariant(overlayContext, 'ActionResultModal should have OverlayContext');\n+ const { position, routeIndex } = overlayContext;\nconst progress = React.useMemo(\n() =>\ninterpolate(position, {\n- inputRange: [index - 1, index],\n+ inputRange: [routeIndex - 1, routeIndex],\noutputRange: [0, 1],\nextrapolate: Extrapolate.CLAMP,\n}),\n- [position, index],\n+ [position, routeIndex],\n);\n// Timer resets whenever message updates\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-navigator.react.js",
"new_path": "native/navigation/overlay-navigator.react.js",
"diff": "@@ -26,10 +26,6 @@ import PropTypes from 'prop-types';\nimport OverlayRouter from './overlay-router';\n-const OverlayPositionContext: React.Context<Animated.Value> = React.createContext(\n- null,\n-);\n-\nfunction createOverlayNavigator(\nrouteConfigMap: NavigationRouteConfigMap,\nstackConfig: StackNavigatorConfig = {},\n@@ -157,12 +153,7 @@ class OverlayNavigator extends React.PureComponent<Props> {\nviews.unshift(this.renderScene(scene, transitionProps, pressable));\n}\n-\n- return (\n- <OverlayPositionContext.Provider value={this.position}>\n- {views}\n- </OverlayPositionContext.Provider>\n- );\n+ return views;\n};\nrenderScene(\n@@ -176,15 +167,17 @@ class OverlayNavigator extends React.PureComponent<Props> {\nconst { navigation, getComponent } = scene.descriptor;\nconst SceneComponent = getComponent();\nconst pointerEvents = pressable ? 'auto' : 'none';\n+ const overlayContext = {\n+ position: this.position,\n+ isDismissing: transitionProps.index < scene.index,\n+ routeIndex: scene.index,\n+ };\nreturn (\n- <View style={styles.scene} key={scene.key} pointerEvents={pointerEvents}>\n- <SceneComponent\n- navigation={navigation}\n- scene={scene}\n- transitionProps={transitionProps}\n- position={this.position}\n- />\n+ <OverlayContext.Provider value={overlayContext} key={scene.key}>\n+ <View style={styles.scene} pointerEvents={pointerEvents}>\n+ <SceneComponent navigation={navigation} />\n</View>\n+ </OverlayContext.Provider>\n);\n}\n}\n@@ -199,7 +192,23 @@ const styles = StyleSheet.create({\n},\n});\n-function withOverlayPositionContext<\n+export type OverlayContextType = {|\n+ position: Animated.Value,\n+ isDismissing: boolean,\n+ routeIndex: number,\n+|};\n+const OverlayContext: React.Context<?OverlayContextType> = React.createContext(\n+ null,\n+);\n+\n+const overlayContextPropType = PropTypes.shape({\n+ // eslint-disable-next-line import/no-named-as-default-member\n+ position: PropTypes.instanceOf(Animated.Value).isRequired,\n+ isDismissing: PropTypes.bool.isRequired,\n+ routeIndex: PropTypes.number.isRequired,\n+});\n+\n+function withOverlayContext<\nAllProps: {},\nComponentType: React.ComponentType<AllProps>,\n>(\n@@ -207,24 +216,29 @@ function withOverlayPositionContext<\n): React.ComponentType<\n$Diff<\nReact.ElementConfig<ComponentType>,\n- { overlayPosition: ?Animated.Value },\n+ { overlayContext: ?OverlayContextType },\n>,\n> {\n- class OverlayPositionHOC extends React.PureComponent<\n+ class OverlayContextHOC extends React.PureComponent<\n$Diff<\nReact.ElementConfig<ComponentType>,\n- { overlayPosition: ?Animated.Value },\n+ { overlayContext: ?OverlayContextType },\n>,\n> {\nrender() {\nreturn (\n- <OverlayPositionContext.Consumer>\n- {value => <Component {...this.props} overlayPosition={value} />}\n- </OverlayPositionContext.Consumer>\n+ <OverlayContext.Consumer>\n+ {value => <Component {...this.props} overlayContext={value} />}\n+ </OverlayContext.Consumer>\n);\n}\n}\n- return OverlayPositionHOC;\n+ return OverlayContextHOC;\n}\n-export { createOverlayNavigator, withOverlayPositionContext };\n+export {\n+ createOverlayNavigator,\n+ OverlayContext,\n+ overlayContextPropType,\n+ withOverlayContext,\n+};\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/tooltip.react.js",
"new_path": "native/navigation/tooltip.react.js",
"diff": "import type {\nNavigationLeafRoute,\nNavigationStackProp,\n- NavigationStackScene,\n- NavigationStackTransitionProps,\n} from 'react-navigation-stack';\nimport {\ntype VerticalBounds,\n@@ -33,6 +31,7 @@ import {\nPlatform,\n} from 'react-native';\nimport PropTypes from 'prop-types';\n+import invariant from 'invariant';\nimport {\ntype ServerCallState,\n@@ -47,8 +46,15 @@ import {\ndimensionsSelector,\n} from '../selectors/dimension-selectors';\nimport TooltipItem from './tooltip-item.react';\n+import {\n+ withOverlayContext,\n+ type OverlayContextType,\n+ overlayContextPropType,\n+} from './overlay-navigator.react';\n+/* eslint-disable import/no-named-as-default-member */\nconst { Value, Extrapolate, add, multiply, interpolate } = Animated;\n+/* eslint-enable import/no-named-as-default-member */\ntype TooltipSpec<CustomProps> = {|\nentries: $ReadOnlyArray<TooltipEntry<CustomProps>>,\n@@ -75,9 +81,6 @@ type ButtonProps<Navigation> = {\ntype TooltipProps<Navigation> = {\nnavigation: Navigation,\n- scene: NavigationStackScene,\n- transitionProps: NavigationStackTransitionProps,\n- position: Value,\n// Redux state\nscreenDimensions: Dimensions,\nserverCallState: ServerCallState,\n@@ -85,6 +88,8 @@ type TooltipProps<Navigation> = {\ndispatch: Dispatch,\ndispatchActionPayload: DispatchActionPayload,\ndispatchActionPromise: DispatchActionPromise,\n+ // withOverlayContext\n+ overlayContext: ?OverlayContextType,\n};\nfunction createTooltip<\nCustomProps: {},\n@@ -106,30 +111,30 @@ function createTooltip<\n}).isRequired,\ngoBack: PropTypes.func.isRequired,\n}).isRequired,\n- transitionProps: PropTypes.object.isRequired,\n- scene: PropTypes.object.isRequired,\n- position: PropTypes.instanceOf(Value).isRequired,\nscreenDimensions: dimensionsPropType.isRequired,\nserverCallState: serverCallStatePropType.isRequired,\ndispatch: PropTypes.func.isRequired,\ndispatchActionPayload: PropTypes.func.isRequired,\ndispatchActionPromise: PropTypes.func.isRequired,\n+ overlayContext: overlayContextPropType,\n};\nprogress: Value;\nbackdropOpacity: Value;\ntooltipContainerOpacity: Value;\ntooltipVerticalAbove: Value;\ntooltipVerticalBelow: Value;\n- tooltipHorizontalOffset = new Animated.Value(0);\n+ tooltipHorizontalOffset = new Value(0);\ntooltipHorizontal: Value;\nconstructor(props: TooltipPropsType) {\nsuper(props);\n- const { position } = props;\n- const { index } = props.scene;\n+ const { overlayContext } = props;\n+ invariant(overlayContext, 'Tooltip should have OverlayContext');\n+ const { position, routeIndex } = overlayContext;\n+\nthis.progress = interpolate(position, {\n- inputRange: [index - 1, index],\n+ inputRange: [routeIndex - 1, routeIndex],\noutputRange: [0, 1],\nextrapolate: Extrapolate.CLAMP,\n});\n@@ -250,8 +255,8 @@ function createTooltip<\nconst style = {};\nstyle.position = 'absolute';\n- style.alignItems = 'center',\n- style.opacity = this.tooltipContainerOpacity;\n+ (style.alignItems = 'center'),\n+ (style.opacity = this.tooltipContainerOpacity);\nstyle.transform = [{ translateX: this.tooltipHorizontal }];\nconst extraLeftSpace = x;\n@@ -411,7 +416,7 @@ function createTooltip<\n}),\nnull,\ntrue,\n- )(Tooltip);\n+ )(withOverlayContext(Tooltip));\n}\nconst styles = StyleSheet.create({\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] OverlayContext |
129,187 | 06.05.2020 18:33:27 | 14,400 | e9bbc017c92a62399a17dde27e6304a390f4cbaf | [native] useOverlayStyles | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/action-result-modal.react.js",
"new_path": "native/navigation/action-result-modal.react.js",
"diff": "@@ -4,18 +4,14 @@ import type {\nNavigationStackProp,\nNavigationLeafRoute,\n} from 'react-navigation';\n-import type { AppState } from '../redux/redux-setup';\nimport * as React from 'react';\nimport { View, Text } from 'react-native';\nimport Animated from 'react-native-reanimated';\nimport invariant from 'invariant';\n-import { connect } from 'lib/utils/redux-utils';\n-\nimport { contentBottomOffset } from '../selectors/dimension-selectors';\n-import { overlayStyleSelector, type StyleSheetOf } from '../themes/colors';\n-import { connectNav, type NavContextType } from './navigation-context';\n+import { useOverlayStyles } from '../themes/colors';\nimport { OverlayContext } from './overlay-navigator.react';\n/* eslint-disable import/no-named-as-default-member */\n@@ -32,8 +28,6 @@ type NavProp = NavigationStackProp<{|\ntype Props = {|\nnavigation: NavProp,\n- // Redux state\n- styles: StyleSheetOf<typeof styles>,\n|};\nfunction ActionResultModal(props: Props) {\nconst overlayContext = React.useContext(OverlayContext);\n@@ -57,21 +51,22 @@ function ActionResultModal(props: Props) {\nreturn () => clearTimeout(timeoutID);\n}, [message, goBack]);\n+ const styles = useOverlayStyles(ourStyles);\nconst containerStyle = {\n- ...props.styles.container,\n+ ...styles.container,\nopacity: progress,\n};\nreturn (\n<Animated.View style={containerStyle}>\n- <View style={props.styles.message}>\n- <View style={props.styles.backdrop} />\n- <Text style={props.styles.text}>{message}</Text>\n+ <View style={styles.message}>\n+ <View style={styles.backdrop} />\n+ <Text style={styles.text}>{message}</Text>\n</View>\n</Animated.View>\n);\n}\n-const styles = {\n+const ourStyles = {\nbackdrop: {\nbackgroundColor: 'modalContrastBackground',\nbottom: 0,\n@@ -98,15 +93,5 @@ const styles = {\ntextAlign: 'center',\n},\n};\n-const stylesSelector = overlayStyleSelector(styles);\n-export default connectNav((context: ?NavContextType) => ({\n- navContext: context,\n-}))(\n- connect((state: AppState, ownProps: { navContext: ?NavContextType }) => ({\n- styles: stylesSelector({\n- redux: state,\n- navContext: ownProps.navContext,\n- }),\n- }))(ActionResultModal),\n-);\n+export default ActionResultModal;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/nav-selectors.js",
"new_path": "native/navigation/nav-selectors.js",
"diff": "@@ -119,12 +119,10 @@ const scrollBlockingChatModalsClosedSelector: (\n},\n);\n-const backgroundIsDarkSelector: (\n- input: NavPlusRedux,\n-) => boolean = createSelector(\n- (input: NavPlusRedux) => input.navContext && input.navContext.state,\n- (input: NavPlusRedux) => input.redux.globalThemeInfo.activeTheme,\n- (navigationState: ?NavigationState, theme: ?GlobalTheme) => {\n+function selectBackgroundIsDark(\n+ navigationState: ?NavigationState,\n+ theme: ?GlobalTheme,\n+) {\nif (!navigationState) {\nreturn false;\n}\n@@ -144,8 +142,7 @@ const backgroundIsDarkSelector: (\nreturn true;\n}\nreturn theme === 'dark';\n- },\n-);\n+}\nconst overlayModalClosingSelector: (\ncontext: ?NavContextType,\n@@ -286,7 +283,7 @@ export {\nforegroundKeySelector,\ncreateActiveTabSelector,\nscrollBlockingChatModalsClosedSelector,\n- backgroundIsDarkSelector,\n+ selectBackgroundIsDark,\noverlayModalClosingSelector,\nactiveThreadSelector,\nactiveMessageListSelector,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/themes/colors.js",
"new_path": "native/themes/colors.js",
"diff": "import type { GlobalTheme } from '../types/themes';\nimport type { AppState } from '../redux/redux-setup';\n-import type { NavPlusRedux } from '../types/selector-types';\n+import * as React from 'react';\nimport { StyleSheet } from 'react-native';\nimport { createSelector } from 'reselect';\nimport PropTypes from 'prop-types';\n+import { useSelector } from 'react-redux';\n-import { backgroundIsDarkSelector } from '../navigation/nav-selectors';\n+import { selectBackgroundIsDark } from '../navigation/nav-selectors';\n+import { NavContext } from '../navigation/navigation-context';\nconst light = Object.freeze({\nredButton: '#BB8888',\n@@ -130,14 +132,6 @@ const colorsSelector: (state: AppState) => Colors = createSelector(\n},\n);\n-const overlayColorsSelector: (input: NavPlusRedux) => Colors = createSelector(\n- backgroundIsDarkSelector,\n- (backgroundIsDark: boolean) => {\n- const syntheticTheme = backgroundIsDark ? 'dark' : 'light';\n- return colors[syntheticTheme];\n- },\n-);\n-\nconst magicStrings = new Set();\nfor (let theme in colors) {\nfor (let magicString in colors[theme]) {\n@@ -148,11 +142,19 @@ for (let theme in colors) {\ntype Styles = { [name: string]: { [field: string]: number | string } };\ntype ReplaceField = (input: any) => any;\n-type ReplaceStyleObject = <Obj: {[key: string]: (number | string)}>(Obj) => $ObjMap<Obj, ReplaceField>;\n+type ReplaceStyleObject = <Obj: { [key: string]: number | string }>(\n+ Obj,\n+) => $ObjMap<Obj, ReplaceField>;\n-export type StyleSheetOf<S: Styles> = $Call<typeof StyleSheet.create, $ObjMap<S, ReplaceStyleObject>>;\n+export type StyleSheetOf<S: Styles> = $Call<\n+ typeof StyleSheet.create,\n+ $ObjMap<S, ReplaceStyleObject>,\n+>;\n-function stylesFromColors<IS: Styles>(obj: IS, themeColors: Colors): StyleSheetOf<IS> {\n+function stylesFromColors<IS: Styles>(\n+ obj: IS,\n+ themeColors: Colors,\n+): StyleSheetOf<IS> {\nconst result = {};\nfor (let key in obj) {\nconst style = obj[key];\n@@ -171,25 +173,38 @@ function stylesFromColors<IS: Styles>(obj: IS, themeColors: Colors): StyleSheetO\nreturn StyleSheet.create(result);\n}\n-function styleSelector<IS: Styles>(obj: IS): (state: AppState) => StyleSheetOf<IS> {\n+function styleSelector<IS: Styles>(\n+ obj: IS,\n+): (state: AppState) => StyleSheetOf<IS> {\nreturn createSelector(colorsSelector, (themeColors: Colors) =>\nstylesFromColors(obj, themeColors),\n);\n}\n-function overlayStyleSelector<IS: Styles>(\n- obj: IS,\n-): (input: NavPlusRedux) => StyleSheetOf<IS> {\n- return createSelector(overlayColorsSelector, (themeColors: Colors) =>\n- stylesFromColors(obj, themeColors),\n+function useOverlayStyles<IS: Styles>(obj: IS): StyleSheetOf<IS> {\n+ const navContext = React.useContext(NavContext);\n+ const navigationState = navContext && navContext.state;\n+\n+ const theme = useSelector(\n+ (state: AppState) => state.globalThemeInfo.activeTheme,\n);\n+\n+ const backgroundIsDark = React.useMemo(\n+ () => selectBackgroundIsDark(navigationState, theme),\n+ [navigationState, theme],\n+ );\n+ const syntheticTheme = backgroundIsDark ? 'dark' : 'light';\n+\n+ return React.useMemo(() => stylesFromColors(obj, colors[syntheticTheme]), [\n+ obj,\n+ syntheticTheme,\n+ ]);\n}\nexport {\ncolorsPropType,\ncolors,\ncolorsSelector,\n- overlayColorsSelector,\nstyleSelector,\n- overlayStyleSelector,\n+ useOverlayStyles,\n};\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] useOverlayStyles |
129,187 | 06.05.2020 18:57:43 | 14,400 | 6eebe02539276867811aa63d239f09bb93a44d5f | [native] overlay-context.js | [
{
"change_type": "MODIFY",
"old_path": "native/chat/multimedia-message-multimedia.react.js",
"new_path": "native/chat/multimedia-message-multimedia.react.js",
"diff": "@@ -48,7 +48,7 @@ import {\nwithOverlayContext,\ntype OverlayContextType,\noverlayContextPropType,\n-} from '../navigation/overlay-navigator.react';\n+} from '../navigation/overlay-context';\n/* eslint-disable import/no-named-as-default-member */\nconst {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/media/camera-modal.react.js",
"new_path": "native/media/camera-modal.react.js",
"diff": "@@ -64,7 +64,7 @@ import {\nwithOverlayContext,\ntype OverlayContextType,\noverlayContextPropType,\n-} from '../navigation/overlay-navigator.react';\n+} from '../navigation/overlay-context';\n/* eslint-disable import/no-named-as-default-member */\nconst {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/media/multimedia-modal.react.js",
"new_path": "native/media/multimedia-modal.react.js",
"diff": "@@ -60,7 +60,7 @@ import {\nwithOverlayContext,\ntype OverlayContextType,\noverlayContextPropType,\n-} from '../navigation/overlay-navigator.react';\n+} from '../navigation/overlay-context';\n/* eslint-disable import/no-named-as-default-member */\nconst {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/action-result-modal.react.js",
"new_path": "native/navigation/action-result-modal.react.js",
"diff": "@@ -12,7 +12,7 @@ import invariant from 'invariant';\nimport { contentBottomOffset } from '../selectors/dimension-selectors';\nimport { useOverlayStyles } from '../themes/colors';\n-import { OverlayContext } from './overlay-navigator.react';\n+import { OverlayContext } from './overlay-context';\n/* eslint-disable import/no-named-as-default-member */\nconst { Extrapolate, interpolate } = Animated;\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "native/navigation/overlay-context.js",
"diff": "+// @flow\n+\n+import * as React from 'react';\n+import Animated from 'react-native-reanimated';\n+import PropTypes from 'prop-types';\n+\n+export type OverlayContextType = {|\n+ position: Animated.Value,\n+ isDismissing: boolean,\n+ routeIndex: number,\n+|};\n+const OverlayContext: React.Context<?OverlayContextType> = React.createContext(\n+ null,\n+);\n+\n+const overlayContextPropType = PropTypes.shape({\n+ // eslint-disable-next-line import/no-named-as-default-member\n+ position: PropTypes.instanceOf(Animated.Value).isRequired,\n+ isDismissing: PropTypes.bool.isRequired,\n+ routeIndex: PropTypes.number.isRequired,\n+});\n+\n+function withOverlayContext<\n+ AllProps: {},\n+ ComponentType: React.ComponentType<AllProps>,\n+>(\n+ Component: ComponentType,\n+): React.ComponentType<\n+ $Diff<\n+ React.ElementConfig<ComponentType>,\n+ { overlayContext: ?OverlayContextType },\n+ >,\n+> {\n+ class OverlayContextHOC extends React.PureComponent<\n+ $Diff<\n+ React.ElementConfig<ComponentType>,\n+ { overlayContext: ?OverlayContextType },\n+ >,\n+ > {\n+ render() {\n+ return (\n+ <OverlayContext.Consumer>\n+ {value => <Component {...this.props} overlayContext={value} />}\n+ </OverlayContext.Consumer>\n+ );\n+ }\n+ }\n+ return OverlayContextHOC;\n+}\n+\n+export { OverlayContext, overlayContextPropType, withOverlayContext };\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-navigator.react.js",
"new_path": "native/navigation/overlay-navigator.react.js",
"diff": "@@ -25,6 +25,7 @@ import Animated, { Easing } from 'react-native-reanimated';\nimport PropTypes from 'prop-types';\nimport OverlayRouter from './overlay-router';\n+import { OverlayContext } from './overlay-context';\nfunction createOverlayNavigator(\nrouteConfigMap: NavigationRouteConfigMap,\n@@ -192,53 +193,4 @@ const styles = StyleSheet.create({\n},\n});\n-export type OverlayContextType = {|\n- position: Animated.Value,\n- isDismissing: boolean,\n- routeIndex: number,\n-|};\n-const OverlayContext: React.Context<?OverlayContextType> = React.createContext(\n- null,\n-);\n-\n-const overlayContextPropType = PropTypes.shape({\n- // eslint-disable-next-line import/no-named-as-default-member\n- position: PropTypes.instanceOf(Animated.Value).isRequired,\n- isDismissing: PropTypes.bool.isRequired,\n- routeIndex: PropTypes.number.isRequired,\n-});\n-\n-function withOverlayContext<\n- AllProps: {},\n- ComponentType: React.ComponentType<AllProps>,\n->(\n- Component: ComponentType,\n-): React.ComponentType<\n- $Diff<\n- React.ElementConfig<ComponentType>,\n- { overlayContext: ?OverlayContextType },\n- >,\n-> {\n- class OverlayContextHOC extends React.PureComponent<\n- $Diff<\n- React.ElementConfig<ComponentType>,\n- { overlayContext: ?OverlayContextType },\n- >,\n- > {\n- render() {\n- return (\n- <OverlayContext.Consumer>\n- {value => <Component {...this.props} overlayContext={value} />}\n- </OverlayContext.Consumer>\n- );\n- }\n- }\n- return OverlayContextHOC;\n-}\n-\n-export {\n- createOverlayNavigator,\n- OverlayContext,\n- overlayContextPropType,\n- withOverlayContext,\n-};\n+export { createOverlayNavigator };\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/tooltip.react.js",
"new_path": "native/navigation/tooltip.react.js",
"diff": "@@ -50,7 +50,7 @@ import {\nwithOverlayContext,\ntype OverlayContextType,\noverlayContextPropType,\n-} from './overlay-navigator.react';\n+} from './overlay-context';\n/* eslint-disable import/no-named-as-default-member */\nconst { Value, Extrapolate, add, multiply, interpolate } = Animated;\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] overlay-context.js |
129,187 | 06.05.2020 19:16:24 | 14,400 | 76f498aaf2ab49a0c84938869b5350440cca37d3 | [native] Turn off react/prop-types ESLint rule | [
{
"change_type": "MODIFY",
"old_path": "native/.eslintrc.json",
"new_path": "native/.eslintrc.json",
"diff": "\"react-native/sort-styles\": 2,\n\"react-native/no-inline-styles\": 2,\n\"react-native/no-raw-text\": 2,\n- \"react-native/no-single-element-style-arrays\": 2\n+ \"react-native/no-single-element-style-arrays\": 2,\n+ \"react/prop-types\": 0\n},\n\"overrides\": [\n{\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Turn off react/prop-types ESLint rule |
129,187 | 06.05.2020 19:16:38 | 14,400 | ccd503c083d27bae0602289d2138f8f2a0b70f41 | [native] Convert OverlayNavigator to hook | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-navigator.react.js",
"new_path": "native/navigation/overlay-navigator.react.js",
"diff": "@@ -22,7 +22,6 @@ import {\nimport { createNavigator, StackActions } from 'react-navigation';\nimport { Transitioner } from 'react-navigation-stack';\nimport Animated, { Easing } from 'react-native-reanimated';\n-import PropTypes from 'prop-types';\nimport OverlayRouter from './overlay-router';\nimport { OverlayContext } from './overlay-context';\n@@ -58,76 +57,95 @@ function createOverlayNavigator(\n);\n}\n+function configureTransition() {\n+ const spec: NavigationTransitionSpec = ({\n+ duration: 250,\n+ easing: BaseEasing.inOut(BaseEasing.ease),\n+ timing: BaseAnimated.timing,\n+ useNativeDriver: true,\n+ }: any);\n+ return spec;\n+}\n+\ntype OverlayNavigatorProps = {\nnavigation: NavigationStackProp<NavigationState>,\ndescriptors: { [key: string]: NavigationDescriptor },\nnavigationConfig: StackNavigatorConfig,\n};\ntype Props = $ReadOnly<OverlayNavigatorProps>;\n-class OverlayNavigator extends React.PureComponent<Props> {\n- static propTypes = {\n- navigation: PropTypes.object.isRequired,\n- descriptors: PropTypes.object.isRequired,\n- navigationConfig: PropTypes.object.isRequired,\n- };\n- position: Animated.Value;\n+function OverlayNavigator(props: Props) {\n+ const { navigation, descriptors } = props;\n+ const curIndex = navigation.state.index;\n- constructor(props: Props) {\n- super(props);\n+ const positionRef = React.useRef();\n+ if (!positionRef.current) {\n// eslint-disable-next-line import/no-named-as-default-member\n- this.position = new Animated.Value(props.navigation.state.index);\n+ positionRef.current = new Animated.Value(curIndex);\n}\n+ const position = positionRef.current;\n- render() {\n- return (\n- <Transitioner\n- render={this.renderScenes}\n- configureTransition={this.configureTransition}\n- navigation={this.props.navigation}\n- descriptors={this.props.descriptors}\n- onTransitionStart={this.onTransitionStart}\n- onTransitionEnd={this.onTransitionEnd}\n- />\n- );\n- }\n-\n- configureTransition = () => {\n- const spec: NavigationTransitionSpec = ({\n- duration: 250,\n- easing: BaseEasing.inOut(BaseEasing.ease),\n- timing: BaseAnimated.timing,\n- useNativeDriver: true,\n- }: any);\n- return spec;\n- };\n-\n- onTransitionStart = (transitionProps: NavigationStackTransitionProps) => {\n+ const onTransitionStart = React.useCallback(\n+ (transitionProps: NavigationStackTransitionProps) => {\nconst { index } = transitionProps.navigation.state;\n// eslint-disable-next-line import/no-named-as-default-member\n- Animated.timing(this.position, {\n+ Animated.timing(position, {\nduration: 250,\neasing: Easing.inOut(Easing.ease),\ntoValue: index,\n}).start();\n- };\n+ },\n+ [position],\n+ );\n- onTransitionEnd = (transitionProps: NavigationStackTransitionProps) => {\n+ const onTransitionEnd = React.useCallback(\n+ (transitionProps: NavigationStackTransitionProps) => {\nif (!transitionProps.navigation.state.isTransitioning) {\nreturn;\n}\n- const { navigation } = this.props;\nconst transitionDestKey = transitionProps.scene.route.key;\nconst isCurrentKey =\n- navigation.state.routes[navigation.state.index].key === transitionDestKey;\n+ navigation.state.routes[navigation.state.index].key ===\n+ transitionDestKey;\nif (!isCurrentKey) {\nreturn;\n}\nnavigation.dispatch(\nStackActions.completeTransition({ toChildKey: transitionDestKey }),\n);\n+ },\n+ [navigation],\n+ );\n+\n+ const renderScene = React.useCallback(\n+ (\n+ scene: NavigationStackScene,\n+ transitionProps: NavigationStackTransitionProps,\n+ pressable: boolean,\n+ ) => {\n+ if (!scene.descriptor) {\n+ return null;\n+ }\n+ const { navigation: childNavigation, getComponent } = scene.descriptor;\n+ const SceneComponent = getComponent();\n+ const pointerEvents = pressable ? 'auto' : 'none';\n+ const overlayContext = {\n+ position,\n+ isDismissing: transitionProps.index < scene.index,\n+ routeIndex: scene.index,\n};\n+ return (\n+ <OverlayContext.Provider value={overlayContext} key={scene.key}>\n+ <View style={styles.scene} pointerEvents={pointerEvents}>\n+ <SceneComponent navigation={childNavigation} />\n+ </View>\n+ </OverlayContext.Provider>\n+ );\n+ },\n+ [position],\n+ );\n- renderScenes = (transitionProps: NavigationStackTransitionProps) => {\n+ const renderScenes = React.useCallback(\n+ (transitionProps: NavigationStackTransitionProps) => {\nconst views = [];\nlet pressableSceneAssigned = false,\nactiveSceneFound = false;\n@@ -152,36 +170,24 @@ class OverlayNavigator extends React.PureComponent<Props> {\npressableSceneAssigned = true;\n}\n- views.unshift(this.renderScene(scene, transitionProps, pressable));\n+ views.unshift(renderScene(scene, transitionProps, pressable));\n}\nreturn views;\n- };\n+ },\n+ [renderScene],\n+ );\n- renderScene(\n- scene: NavigationStackScene,\n- transitionProps: NavigationStackTransitionProps,\n- pressable: boolean,\n- ) {\n- if (!scene.descriptor) {\n- return null;\n- }\n- const { navigation, getComponent } = scene.descriptor;\n- const SceneComponent = getComponent();\n- const pointerEvents = pressable ? 'auto' : 'none';\n- const overlayContext = {\n- position: this.position,\n- isDismissing: transitionProps.index < scene.index,\n- routeIndex: scene.index,\n- };\nreturn (\n- <OverlayContext.Provider value={overlayContext} key={scene.key}>\n- <View style={styles.scene} pointerEvents={pointerEvents}>\n- <SceneComponent navigation={navigation} />\n- </View>\n- </OverlayContext.Provider>\n+ <Transitioner\n+ render={renderScenes}\n+ configureTransition={configureTransition}\n+ navigation={navigation}\n+ descriptors={descriptors}\n+ onTransitionStart={onTransitionStart}\n+ onTransitionEnd={onTransitionEnd}\n+ />\n);\n}\n-}\nconst styles = StyleSheet.create({\nscene: {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Convert OverlayNavigator to hook |
129,187 | 07.05.2020 19:05:53 | 14,400 | e0851012e3b4704d4edcba43967d147cdf1fdba4 | [native] Remove OverlayNavigator's dependency on Transitioner | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-navigator.react.js",
"new_path": "native/navigation/overlay-navigator.react.js",
"diff": "@@ -5,27 +5,23 @@ import type {\nNavigationState,\nNavigationDescriptor,\nNavigationRouteConfigMap,\n- NavigationStackTransitionProps,\n- NavigationStackScene,\nStackNavigatorConfig,\n- NavigationTransitionSpec,\n} from 'react-navigation-stack';\nimport type { NavigationStackScreenOptions } from 'react-navigation';\nimport * as React from 'react';\n-import {\n- View,\n- StyleSheet,\n- Animated as BaseAnimated,\n- Easing as BaseEasing,\n-} from 'react-native';\n-import { createNavigator, StackActions } from 'react-navigation';\n-import { Transitioner } from 'react-navigation-stack';\n+import { View, StyleSheet } from 'react-native';\n+import { createNavigator } from 'react-navigation';\nimport Animated, { Easing } from 'react-native-reanimated';\n+import invariant from 'invariant';\nimport OverlayRouter from './overlay-router';\nimport { OverlayContext } from './overlay-context';\n+/* eslint-disable import/no-named-as-default-member */\n+const { Value, timing, cond, call, lessOrEq, block } = Animated;\n+/* eslint-enable import/no-named-as-default-member */\n+\nfunction createOverlayNavigator(\nrouteConfigMap: NavigationRouteConfigMap,\nstackConfig: StackNavigatorConfig = {},\n@@ -57,106 +53,192 @@ function createOverlayNavigator(\n);\n}\n-function configureTransition() {\n- const spec: NavigationTransitionSpec = ({\n- duration: 250,\n- easing: BaseEasing.inOut(BaseEasing.ease),\n- timing: BaseAnimated.timing,\n- useNativeDriver: true,\n- }: any);\n- return spec;\n-}\n-\ntype OverlayNavigatorProps = {\nnavigation: NavigationStackProp<NavigationState>,\ndescriptors: { [key: string]: NavigationDescriptor },\nnavigationConfig: StackNavigatorConfig,\n};\ntype Props = $ReadOnly<OverlayNavigatorProps>;\n-function OverlayNavigator(props: Props) {\n+const OverlayNavigator = React.memo<Props>((props: Props) => {\nconst { navigation, descriptors } = props;\nconst curIndex = navigation.state.index;\nconst positionRef = React.useRef();\nif (!positionRef.current) {\n- // eslint-disable-next-line import/no-named-as-default-member\n- positionRef.current = new Animated.Value(curIndex);\n+ positionRef.current = new Value(curIndex);\n}\nconst position = positionRef.current;\n- const onTransitionStart = React.useCallback(\n- (transitionProps: NavigationStackTransitionProps) => {\n- const { index } = transitionProps.navigation.state;\n- // eslint-disable-next-line import/no-named-as-default-member\n- Animated.timing(position, {\n- duration: 250,\n- easing: Easing.inOut(Easing.ease),\n- toValue: index,\n- }).start();\n+ const { routes } = navigation.state;\n+ const scenes = React.useMemo(\n+ () =>\n+ routes.map((route, routeIndex) => {\n+ const descriptor = descriptors[route.key];\n+ invariant(\n+ descriptor,\n+ `OverlayNavigator could not find descriptor for ${route.key}`,\n+ );\n+ return {\n+ route,\n+ descriptor,\n+ context: {\n+ position,\n+ isDismissing: curIndex < routeIndex,\n+ routeIndex,\n},\n- [position],\n+ };\n+ }),\n+ [position, routes, descriptors, curIndex],\n);\n- const onTransitionEnd = React.useCallback(\n- (transitionProps: NavigationStackTransitionProps) => {\n- if (!transitionProps.navigation.state.isTransitioning) {\n- return;\n+ const prevScenesRef = React.useRef(null);\n+ const prevScenes = prevScenesRef.current;\n+\n+ // We need state to continue rendering screens while they are dismissing\n+ const [sceneData, setSceneData] = React.useState(() => {\n+ const newSceneData = {};\n+ for (let scene of scenes) {\n+ const { key } = scene.route;\n+ newSceneData[key] = { ...scene, listeners: [] };\n}\n- const transitionDestKey = transitionProps.scene.route.key;\n- const isCurrentKey =\n- navigation.state.routes[navigation.state.index].key ===\n- transitionDestKey;\n- if (!isCurrentKey) {\n- return;\n+ return newSceneData;\n+ });\n+\n+ // This block keeps sceneData updated when our props change. It's the\n+ // hook equivalent of getDerivedStateFromProps\n+ // https://reactjs.org/docs/hooks-faq.html#how-do-i-implement-getderivedstatefromprops\n+ const updatedSceneData = { ...sceneData };\n+ if (prevScenes && scenes !== prevScenes) {\n+ let sceneDataChanged = false;\n+\n+ let sceneAdded = false;\n+ const currentKeys = new Set();\n+ for (let scene of scenes) {\n+ const { key } = scene.route;\n+ currentKeys.add(key);\n+\n+ let data = updatedSceneData[key];\n+ if (!data) {\n+ // A new route has been pushed\n+ updatedSceneData[key] = { ...scene, listeners: [] };\n+ sceneDataChanged = true;\n+ sceneAdded = true;\n+ continue;\n}\n- navigation.dispatch(\n- StackActions.completeTransition({ toChildKey: transitionDestKey }),\n- );\n- },\n- [navigation],\n- );\n- const renderScene = React.useCallback(\n- (\n- scene: NavigationStackScene,\n- transitionProps: NavigationStackTransitionProps,\n- pressable: boolean,\n- ) => {\n- if (!scene.descriptor) {\n- return null;\n+ let dataChanged = false;\n+ if (scene.route !== data.route) {\n+ data = { ...data, route: scene.route };\n+ dataChanged = true;\n}\n- const { navigation: childNavigation, getComponent } = scene.descriptor;\n- const SceneComponent = getComponent();\n- const pointerEvents = pressable ? 'auto' : 'none';\n- const overlayContext = {\n- position,\n- isDismissing: transitionProps.index < scene.index,\n- routeIndex: scene.index,\n+ if (scene.descriptor !== data.descriptor) {\n+ data = { ...data, descriptor: scene.descriptor };\n+ dataChanged = true;\n+ }\n+ if (\n+ scene.context.position !== data.context.position ||\n+ scene.context.isDismissing !== data.context.isDismissing ||\n+ scene.context.routeIndex !== data.context.routeIndex\n+ ) {\n+ data = { ...data, context: scene.context };\n+ dataChanged = true;\n+ }\n+\n+ if (dataChanged) {\n+ // Something about an existing route has changed\n+ updatedSceneData[key] = data;\n+ sceneDataChanged = true;\n+ }\n+ }\n+\n+ let dismissingSceneData;\n+ if (!sceneAdded) {\n+ // Pushing a new route wipes out any dismissals\n+ for (let i = 0; i < prevScenes.length; i++) {\n+ const scene = prevScenes[i];\n+ const { key } = scene.route;\n+ if (currentKeys.has(key)) {\n+ continue;\n+ }\n+ currentKeys.add(key);\n+ const data = updatedSceneData[key];\n+ invariant(data, `should have sceneData for dismissed key ${key}`);\n+ // A route just got dismissed\n+ // We'll watch the animation to determine when to clear the screen\n+ dismissingSceneData = {\n+ ...data,\n+ listeners: [\n+ cond(\n+ lessOrEq(position, i - 1),\n+ call([], () =>\n+ setSceneData(prevSceneData => {\n+ const newSceneData = { ...prevSceneData };\n+ delete newSceneData[key];\n+ return newSceneData;\n+ }),\n+ ),\n+ ),\n+ ],\n};\n- return (\n- <OverlayContext.Provider value={overlayContext} key={scene.key}>\n- <View style={styles.scene} pointerEvents={pointerEvents}>\n- <SceneComponent navigation={childNavigation} />\n- </View>\n- </OverlayContext.Provider>\n- );\n- },\n- [position],\n+ updatedSceneData[key] = dismissingSceneData;\n+ sceneDataChanged = true;\n+ break;\n+ }\n+ }\n+\n+ if (sceneAdded || dismissingSceneData) {\n+ // We start an animation whenever a scene is added or dismissed\n+ timing(position, {\n+ duration: 250,\n+ easing: Easing.inOut(Easing.ease),\n+ toValue: curIndex,\n+ }).start();\n+ }\n+\n+ // We want to keep at most one dismissing scene in the sceneData at a time\n+ for (let key in updatedSceneData) {\n+ if (currentKeys.has(key)) {\n+ continue;\n+ }\n+ const data = updatedSceneData[key];\n+ if (!sceneAdded && !dismissingSceneData && data.listeners.length > 0) {\n+ dismissingSceneData = data;\n+ } else {\n+ // A route has just gotten cleared. This can occur if multiple routes\n+ // are popped off at once, or if the user pops two routes in rapid\n+ // succession\n+ delete updatedSceneData[key];\n+ sceneDataChanged = true;\n+ }\n+ }\n+\n+ if (sceneDataChanged) {\n+ setSceneData(updatedSceneData);\n+ }\n+ }\n+\n+ // Usually this would be done in an effect, but calling setState from the body\n+ // of a hook causes the hook to rerender before triggering effects. To avoid\n+ // infinite loops we make sure to set prevScenes after we finish comparing it\n+ prevScenesRef.current = scenes;\n+\n+ // Flow won't let us use Object.values...\n+ const unsortedSceneList = [];\n+ for (let key in updatedSceneData) {\n+ unsortedSceneList.push(updatedSceneData[key]);\n+ }\n+ const sceneList = unsortedSceneList.sort(\n+ (a, b) => a.context.routeIndex - b.context.routeIndex,\n);\n- const renderScenes = React.useCallback(\n- (transitionProps: NavigationStackTransitionProps) => {\n- const views = [];\n+ const screens = [];\nlet pressableSceneAssigned = false,\nactiveSceneFound = false;\n- for (let i = transitionProps.scenes.length - 1; i >= 0; i--) {\n- const scene = transitionProps.scenes[i];\n- const {\n- isActive,\n- route: { params },\n- } = scene;\n+ for (let i = sceneList.length - 1; i >= 0; i--) {\n+ const scene = sceneList[i];\n+ const { route, descriptor, context, listeners } = scene;\n- if (isActive) {\n+ if (!context.isDismissing) {\nactiveSceneFound = true;\n}\n@@ -164,31 +246,35 @@ function OverlayNavigator(props: Props) {\nif (\n!pressableSceneAssigned &&\nactiveSceneFound &&\n- (!params || !params.preventPresses)\n+ (!route.params || !route.params.preventPresses)\n) {\n+ // Only one route can be pressable at a time. We pick the first route that\n+ // is not dismissing and doesn't have preventPresses set in its params\npressable = true;\npressableSceneAssigned = true;\n}\n- views.unshift(renderScene(scene, transitionProps, pressable));\n- }\n- return views;\n- },\n- [renderScene],\n- );\n+ const { navigation: childNavigation, getComponent } = descriptor;\n+ const SceneComponent = getComponent();\n+ const pointerEvents = pressable ? 'auto' : 'none';\n- return (\n- <Transitioner\n- render={renderScenes}\n- configureTransition={configureTransition}\n- navigation={navigation}\n- descriptors={descriptors}\n- onTransitionStart={onTransitionStart}\n- onTransitionEnd={onTransitionEnd}\n- />\n+ // These listeners are used to clear routes after they finish dismissing\n+ const listenerCode =\n+ listeners.length > 0 ? <Animated.Code exec={block(listeners)} /> : null;\n+ screens.unshift(\n+ <OverlayContext.Provider value={context} key={route.key}>\n+ <View style={styles.scene} pointerEvents={pointerEvents}>\n+ <SceneComponent navigation={childNavigation} />\n+ </View>\n+ {listenerCode}\n+ </OverlayContext.Provider>,\n);\n}\n+ return screens;\n+});\n+OverlayNavigator.displayName = 'OverlayNavigator';\n+\nconst styles = StyleSheet.create({\nscene: {\nbottom: 0,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Remove OverlayNavigator's dependency on Transitioner |
129,187 | 07.05.2020 23:52:48 | 14,400 | 9e10ab7a37ce5b978950edcce30e0bd6066df6b9 | [native] Add scrollBlockingModalStatus to OverlayContext | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-context.js",
"new_path": "native/navigation/overlay-context.js",
"diff": "@@ -4,10 +4,12 @@ import * as React from 'react';\nimport Animated from 'react-native-reanimated';\nimport PropTypes from 'prop-types';\n+export type ScrollBlockingModalStatus = 'open' | 'closed' | 'closing';\nexport type OverlayContextType = {|\nposition: Animated.Value,\nisDismissing: boolean,\nrouteIndex: number,\n+ scrollBlockingModalStatus: ScrollBlockingModalStatus,\n|};\nconst OverlayContext: React.Context<?OverlayContextType> = React.createContext(\nnull,\n@@ -18,6 +20,8 @@ const overlayContextPropType = PropTypes.shape({\nposition: PropTypes.instanceOf(Animated.Value).isRequired,\nisDismissing: PropTypes.bool.isRequired,\nrouteIndex: PropTypes.number.isRequired,\n+ scrollBlockingModalStatus: PropTypes.oneOf(['open', 'closed', 'closing'])\n+ .isRequired,\n});\nfunction withOverlayContext<\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-navigator.react.js",
"new_path": "native/navigation/overlay-navigator.react.js",
"diff": "@@ -15,8 +15,11 @@ import { createNavigator } from 'react-navigation';\nimport Animated, { Easing } from 'react-native-reanimated';\nimport invariant from 'invariant';\n+import { values } from 'lib/utils/objects';\n+\nimport OverlayRouter from './overlay-router';\nimport { OverlayContext } from './overlay-context';\n+import { scrollBlockingChatModals } from './route-names';\n/* eslint-disable import/no-named-as-default-member */\nconst { Value, timing, cond, call, lessOrEq, block } = Animated;\n@@ -94,12 +97,42 @@ const OverlayNavigator = React.memo<Props>((props: Props) => {\nconst prevScenesRef = React.useRef(null);\nconst prevScenes = prevScenesRef.current;\n+ // This state gets incorporated into the OverlayContext, but it's global to\n+ // the navigator rather than local to each screen. We keep it in a ref so we\n+ // can easily reference it when adding to sceneData. It doesn't need to be\n+ // useState because it's incorporated into sceneData below\n+ const scrollBlockingModalStatusRef = React.useRef();\n+ const updateScrollBlockingModalStatus = data => {\n+ scrollBlockingModalStatusRef.current = 'closed';\n+ for (let scene of data) {\n+ if (!scrollBlockingChatModals.includes(scene.route.routeName)) {\n+ continue;\n+ }\n+ if (!scene.context.isDismissing) {\n+ scrollBlockingModalStatusRef.current = 'open';\n+ break;\n+ }\n+ scrollBlockingModalStatusRef.current = 'closing';\n+ }\n+ };\n+ if (!scrollBlockingModalStatusRef.current) {\n+ updateScrollBlockingModalStatus(scenes);\n+ }\n+ const sceneDataForNewScene = scene => ({\n+ ...scene,\n+ context: {\n+ ...scene.context,\n+ scrollBlockingModalStatus: scrollBlockingModalStatusRef.current,\n+ },\n+ listeners: [],\n+ });\n+\n// We need state to continue rendering screens while they are dismissing\nconst [sceneData, setSceneData] = React.useState(() => {\nconst newSceneData = {};\nfor (let scene of scenes) {\nconst { key } = scene.route;\n- newSceneData[key] = { ...scene, listeners: [] };\n+ newSceneData[key] = sceneDataForNewScene(scene);\n}\nreturn newSceneData;\n});\n@@ -120,7 +153,7 @@ const OverlayNavigator = React.memo<Props>((props: Props) => {\nlet data = updatedSceneData[key];\nif (!data) {\n// A new route has been pushed\n- updatedSceneData[key] = { ...scene, listeners: [] };\n+ updatedSceneData[key] = sceneDataForNewScene(scene);\nsceneDataChanged = true;\nsceneAdded = true;\ncontinue;\n@@ -212,6 +245,26 @@ const OverlayNavigator = React.memo<Props>((props: Props) => {\n}\n}\n+ // Now we update scrollBlockingModalStatus. It's global state that depends\n+ // on the whole updatedSceneData, but it's set it in each individual context\n+ const prevScrollBlockingModalStatus = scrollBlockingModalStatusRef.current;\n+ updateScrollBlockingModalStatus(values(updatedSceneData));\n+ if (\n+ prevScrollBlockingModalStatus !== scrollBlockingModalStatusRef.current\n+ ) {\n+ for (let key in updatedSceneData) {\n+ const data = updatedSceneData[key];\n+ updatedSceneData[key] = {\n+ ...data,\n+ context: {\n+ ...data.context,\n+ scrollBlockingModalStatus: scrollBlockingModalStatusRef.current,\n+ },\n+ };\n+ }\n+ sceneDataChanged = true;\n+ }\n+\nif (sceneDataChanged) {\nsetSceneData(updatedSceneData);\n}\n@@ -222,12 +275,7 @@ const OverlayNavigator = React.memo<Props>((props: Props) => {\n// infinite loops we make sure to set prevScenes after we finish comparing it\nprevScenesRef.current = scenes;\n- // Flow won't let us use Object.values...\n- const unsortedSceneList = [];\n- for (let key in updatedSceneData) {\n- unsortedSceneList.push(updatedSceneData[key]);\n- }\n- const sceneList = unsortedSceneList.sort(\n+ const sceneList = values(updatedSceneData).sort(\n(a, b) => a.context.routeIndex - b.context.routeIndex,\n);\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Add scrollBlockingModalStatus to OverlayContext |
129,187 | 08.05.2020 11:34:43 | 14,400 | 0cecb80f3f088c0e7224a58bbb6e6b47e3717408 | [native] Expose setScrollBlockingModalStatus in OverlayContext | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-context.js",
"new_path": "native/navigation/overlay-context.js",
"diff": "@@ -10,6 +10,7 @@ export type OverlayContextType = {|\nisDismissing: boolean,\nrouteIndex: number,\nscrollBlockingModalStatus: ScrollBlockingModalStatus,\n+ setScrollBlockingModalStatus: ScrollBlockingModalStatus => void,\n|};\nconst OverlayContext: React.Context<?OverlayContextType> = React.createContext(\nnull,\n@@ -22,6 +23,7 @@ const overlayContextPropType = PropTypes.shape({\nrouteIndex: PropTypes.number.isRequired,\nscrollBlockingModalStatus: PropTypes.oneOf(['open', 'closed', 'closing'])\n.isRequired,\n+ setScrollBlockingModalStatus: PropTypes.func.isRequired,\n});\nfunction withOverlayContext<\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-navigator.react.js",
"new_path": "native/navigation/overlay-navigator.react.js",
"diff": "@@ -94,39 +94,58 @@ const OverlayNavigator = React.memo<Props>((props: Props) => {\n[position, routes, descriptors, curIndex],\n);\n- const prevScenesRef = React.useRef(null);\n+ const prevScenesRef = React.useRef();\nconst prevScenes = prevScenesRef.current;\n- // This state gets incorporated into the OverlayContext, but it's global to\n- // the navigator rather than local to each screen. We keep it in a ref so we\n- // can easily reference it when adding to sceneData. It doesn't need to be\n- // useState because it's incorporated into sceneData below\n- const scrollBlockingModalStatusRef = React.useRef();\n- const updateScrollBlockingModalStatus = data => {\n- scrollBlockingModalStatusRef.current = 'closed';\n+ // The scrollBlockingModalStatus state gets incorporated into the\n+ // OverlayContext, but it's global to the navigator rather than local to each\n+ // screen. Note that we also include the setter in OverlayContext. We do this\n+ // so that screens can freeze ScrollViews as quickly as possible to avoid\n+ // drags after onLongPress is triggered\n+ const getScrollBlockingModalStatus = data => {\n+ let status = 'closed';\nfor (let scene of data) {\nif (!scrollBlockingChatModals.includes(scene.route.routeName)) {\ncontinue;\n}\nif (!scene.context.isDismissing) {\n- scrollBlockingModalStatusRef.current = 'open';\n+ status = 'open';\nbreak;\n}\n- scrollBlockingModalStatusRef.current = 'closing';\n+ status = 'closing';\n}\n+ return status;\n};\n- if (!scrollBlockingModalStatusRef.current) {\n- updateScrollBlockingModalStatus(scenes);\n- }\n+ const [\n+ scrollBlockingModalStatus,\n+ setScrollBlockingModalStatus,\n+ ] = React.useState(() => getScrollBlockingModalStatus(scenes));\nconst sceneDataForNewScene = scene => ({\n...scene,\ncontext: {\n...scene.context,\n- scrollBlockingModalStatus: scrollBlockingModalStatusRef.current,\n+ scrollBlockingModalStatus,\n+ setScrollBlockingModalStatus,\n},\nlisteners: [],\n});\n+ // We track two previous states of scrollBlockingModalStatus via refs. We need\n+ // two because we expose setScrollBlockingModalStatus to screens. We track the\n+ // previous sceneData-determined value separately so that we only overwrite\n+ // the screen-determined value with the sceneData-determined value when the\n+ // latter actually changes\n+ const prevScrollBlockingModalStatusRef = React.useRef(\n+ scrollBlockingModalStatus,\n+ );\n+ const prevScrollBlockingModalStatus =\n+ prevScrollBlockingModalStatusRef.current;\n+ const prevScrollBlockingModalStatusFromSceneDataRef = React.useRef(\n+ scrollBlockingModalStatus,\n+ );\n+ const prevScrollBlockingModalStatusFromSceneData =\n+ prevScrollBlockingModalStatusFromSceneDataRef.current;\n+\n// We need state to continue rendering screens while they are dismissing\nconst [sceneData, setSceneData] = React.useState(() => {\nconst newSceneData = {};\n@@ -136,14 +155,15 @@ const OverlayNavigator = React.memo<Props>((props: Props) => {\n}\nreturn newSceneData;\n});\n+ const prevSceneDataRef = React.useRef(sceneData);\n+ const prevSceneData = prevSceneDataRef.current;\n// This block keeps sceneData updated when our props change. It's the\n// hook equivalent of getDerivedStateFromProps\n// https://reactjs.org/docs/hooks-faq.html#how-do-i-implement-getderivedstatefromprops\nconst updatedSceneData = { ...sceneData };\n- if (prevScenes && scenes !== prevScenes) {\nlet sceneDataChanged = false;\n-\n+ if (prevScenes && scenes !== prevScenes) {\nlet sceneAdded = false;\nconst currentKeys = new Set();\nfor (let scene of scenes) {\n@@ -186,7 +206,8 @@ const OverlayNavigator = React.memo<Props>((props: Props) => {\nlet dismissingSceneData;\nif (!sceneAdded) {\n- // Pushing a new route wipes out any dismissals\n+ // We only consider a fresh dismissal if no scene has been added because\n+ // pushing a new route wipes out any dismissals\nfor (let i = 0; i < prevScenes.length; i++) {\nconst scene = prevScenes[i];\nconst { key } = scene.route;\n@@ -200,12 +221,16 @@ const OverlayNavigator = React.memo<Props>((props: Props) => {\n// We'll watch the animation to determine when to clear the screen\ndismissingSceneData = {\n...data,\n+ context: {\n+ ...data.context,\n+ isDismissing: true,\n+ },\nlisteners: [\ncond(\nlessOrEq(position, i - 1),\ncall([], () =>\n- setSceneData(prevSceneData => {\n- const newSceneData = { ...prevSceneData };\n+ setSceneData(curSceneData => {\n+ const newSceneData = { ...curSceneData };\ndelete newSceneData[key];\nreturn newSceneData;\n}),\n@@ -244,21 +269,42 @@ const OverlayNavigator = React.memo<Props>((props: Props) => {\nsceneDataChanged = true;\n}\n}\n+ }\n- // Now we update scrollBlockingModalStatus. It's global state that depends\n- // on the whole updatedSceneData, but it's set it in each individual context\n- const prevScrollBlockingModalStatus = scrollBlockingModalStatusRef.current;\n- updateScrollBlockingModalStatus(values(updatedSceneData));\n+ // If sceneData changes, we update scrollBlockingModalStatus based on it, both\n+ // in state and within the individual sceneData contexts. If sceneData doesn't\n+ // change, it's still possible for scrollBlockingModalStatus to change via the\n+ // setScrollBlockingModalStatus callback we expose via context\n+ let newScrollBlockingModalStatus;\n+ if (sceneDataChanged || sceneData !== prevSceneData) {\n+ const statusFromSceneData = getScrollBlockingModalStatus(\n+ values(updatedSceneData),\n+ );\nif (\n- prevScrollBlockingModalStatus !== scrollBlockingModalStatusRef.current\n+ statusFromSceneData !== scrollBlockingModalStatus &&\n+ statusFromSceneData !== prevScrollBlockingModalStatusFromSceneData\n) {\n+ newScrollBlockingModalStatus = statusFromSceneData;\n+ }\n+ prevScrollBlockingModalStatusFromSceneDataRef.current = statusFromSceneData;\n+ }\n+ if (\n+ !newScrollBlockingModalStatus &&\n+ scrollBlockingModalStatus !== prevScrollBlockingModalStatus\n+ ) {\n+ newScrollBlockingModalStatus = scrollBlockingModalStatus;\n+ }\n+ if (newScrollBlockingModalStatus) {\n+ if (newScrollBlockingModalStatus !== scrollBlockingModalStatus) {\n+ setScrollBlockingModalStatus(newScrollBlockingModalStatus);\n+ }\nfor (let key in updatedSceneData) {\nconst data = updatedSceneData[key];\nupdatedSceneData[key] = {\n...data,\ncontext: {\n...data.context,\n- scrollBlockingModalStatus: scrollBlockingModalStatusRef.current,\n+ scrollBlockingModalStatus: newScrollBlockingModalStatus,\n},\n};\n}\n@@ -268,12 +314,16 @@ const OverlayNavigator = React.memo<Props>((props: Props) => {\nif (sceneDataChanged) {\nsetSceneData(updatedSceneData);\n}\n- }\n// Usually this would be done in an effect, but calling setState from the body\n// of a hook causes the hook to rerender before triggering effects. To avoid\n- // infinite loops we make sure to set prevScenes after we finish comparing it\n+ // infinite loops we make sure to set our prev values after we finish\n+ // comparing them\nprevScenesRef.current = scenes;\n+ prevSceneDataRef.current = sceneDataChanged ? updatedSceneData : sceneData;\n+ prevScrollBlockingModalStatusRef.current = newScrollBlockingModalStatus\n+ ? newScrollBlockingModalStatus\n+ : scrollBlockingModalStatus;\nconst sceneList = values(updatedSceneData).sort(\n(a, b) => a.context.routeIndex - b.context.routeIndex,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Expose setScrollBlockingModalStatus in OverlayContext |
129,187 | 08.05.2020 13:39:32 | 14,400 | db0271ad7bdeacaab78aa1f2d1a409cab8ad5f30 | [native] Replace ScrollViewModalContext with OverlayContext | [
{
"change_type": "MODIFY",
"old_path": "native/chat/message-list.react.js",
"new_path": "native/chat/message-list.react.js",
"diff": "@@ -12,16 +12,6 @@ import {\ntype MessageListNavProp,\nmessageListNavPropType,\n} from './message-list-types';\n-import {\n- type ScrollViewModalState,\n- scrollViewModalStatePropType,\n- withScrollViewModalState,\n-} from '../navigation/scroll-view-modal-state';\n-import {\n- type KeyboardState,\n- keyboardStatePropType,\n- withKeyboardState,\n-} from '../keyboard/keyboard-state';\nimport * as React from 'react';\nimport PropTypes from 'prop-types';\n@@ -29,6 +19,7 @@ import { View, FlatList, TouchableWithoutFeedback } from 'react-native';\nimport _sum from 'lodash/fp/sum';\nimport _find from 'lodash/fp/find';\nimport { createSelector } from 'reselect';\n+import invariant from 'invariant';\nimport { messageKey } from 'lib/shared/message-utils';\nimport { connect } from 'lib/utils/redux-utils';\n@@ -49,6 +40,16 @@ import {\n} from './message.react';\nimport ListLoadingIndicator from '../components/list-loading-indicator.react';\nimport { styleSelector } from '../themes/colors';\n+import {\n+ withOverlayContext,\n+ type OverlayContextType,\n+ overlayContextPropType,\n+} from '../navigation/overlay-context';\n+import {\n+ type KeyboardState,\n+ keyboardStatePropType,\n+ withKeyboardState,\n+} from '../keyboard/keyboard-state';\ntype Props = {|\nthreadInfo: ThreadInfo,\n@@ -57,10 +58,6 @@ type Props = {|\n// Redux state\nstartReached: boolean,\nstyles: typeof styles,\n- // withScrollViewModalState\n- scrollViewModalState: ?ScrollViewModalState,\n- // withKeyboardState\n- keyboardState: ?KeyboardState,\n// Redux dispatch functions\ndispatchActionPromise: DispatchActionPromise,\n// async functions that hit server APIs\n@@ -71,6 +68,10 @@ type Props = {|\nfetchMostRecentMessages: (\nthreadID: string,\n) => Promise<FetchMessageInfosPayload>,\n+ // withOverlayContext\n+ overlayContext: ?OverlayContextType,\n+ // withKeyboardState\n+ keyboardState: ?KeyboardState,\n|};\ntype State = {|\nfocusedMessageKey: ?string,\n@@ -92,11 +93,11 @@ class MessageList extends React.PureComponent<Props, State> {\nnavigation: messageListNavPropType.isRequired,\nstartReached: PropTypes.bool.isRequired,\nstyles: PropTypes.objectOf(PropTypes.object).isRequired,\n- scrollViewModalState: scrollViewModalStatePropType,\n- keyboardState: keyboardStatePropType,\ndispatchActionPromise: PropTypes.func.isRequired,\nfetchMessagesBeforeCursor: PropTypes.func.isRequired,\nfetchMostRecentMessages: PropTypes.func.isRequired,\n+ overlayContext: overlayContextPropType,\n+ keyboardState: keyboardStatePropType,\n};\nstate = {\nfocusedMessageKey: null,\n@@ -142,16 +143,20 @@ class MessageList extends React.PureComponent<Props, State> {\n}\n}\n+ static getOverlayContext(props: Props) {\n+ const { overlayContext } = props;\n+ invariant(overlayContext, 'MessageList should have OverlayContext');\n+ return overlayContext;\n+ }\n+\nstatic scrollDisabled(props: Props) {\n- const { scrollViewModalState } = props;\n- return (\n- !!scrollViewModalState && scrollViewModalState.modalState !== 'closed'\n- );\n+ const overlayContext = MessageList.getOverlayContext(props);\n+ return overlayContext.scrollBlockingModalStatus !== 'closed';\n}\nstatic modalOpen(props: Props) {\n- const { scrollViewModalState } = props;\n- return !!scrollViewModalState && scrollViewModalState.modalState === 'open';\n+ const overlayContext = MessageList.getOverlayContext(props);\n+ return overlayContext.scrollBlockingModalStatus !== 'open';\n}\ncomponentDidUpdate(prevProps: Props) {\n@@ -389,4 +394,4 @@ export default connect(\n};\n},\n{ fetchMessagesBeforeCursor, fetchMostRecentMessages },\n-)(withKeyboardState(withScrollViewModalState(MessageList)));\n+)(withKeyboardState(withOverlayContext(MessageList)));\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/multimedia-message-multimedia.react.js",
"new_path": "native/chat/multimedia-message-multimedia.react.js",
"diff": "@@ -19,16 +19,6 @@ import {\ntype MessageListNavProp,\nmessageListNavPropType,\n} from './message-list-types';\n-import {\n- type ScrollViewModalState,\n- scrollViewModalStatePropType,\n- withScrollViewModalState,\n-} from '../navigation/scroll-view-modal-state';\n-import {\n- type KeyboardState,\n- keyboardStatePropType,\n- withKeyboardState,\n-} from '../keyboard/keyboard-state';\nimport type { AppState } from '../redux/redux-setup';\nimport * as React from 'react';\n@@ -44,6 +34,11 @@ import { connect } from 'lib/utils/redux-utils';\nimport InlineMultimedia from './inline-multimedia.react';\nimport { multimediaTooltipHeight } from './multimedia-tooltip-modal.react';\nimport { type Colors, colorsPropType, colorsSelector } from '../themes/colors';\n+import {\n+ type KeyboardState,\n+ keyboardStatePropType,\n+ withKeyboardState,\n+} from '../keyboard/keyboard-state';\nimport {\nwithOverlayContext,\ntype OverlayContextType,\n@@ -89,8 +84,6 @@ type Props = {|\ntoggleMessageFocus: (messageKey: string) => void,\n// Redux state\ncolors: Colors,\n- // withScrollViewModalState\n- scrollViewModalState: ?ScrollViewModalState,\n// withKeyboardState\nkeyboardState: ?KeyboardState,\n// withOverlayContext\n@@ -108,7 +101,6 @@ class MultimediaMessageMultimedia extends React.PureComponent<Props> {\nmessageFocused: PropTypes.bool.isRequired,\ntoggleMessageFocus: PropTypes.func.isRequired,\ncolors: colorsPropType.isRequired,\n- scrollViewModalState: scrollViewModalStatePropType,\nkeyboardState: keyboardStatePropType,\noverlayContext: overlayContextPropType,\n};\n@@ -122,22 +114,19 @@ class MultimediaMessageMultimedia extends React.PureComponent<Props> {\nthis.getOpacity();\n}\n- static getOverlayPosition(props: Props) {\n+ static getOverlayContext(props: Props) {\nconst { overlayContext } = props;\ninvariant(\noverlayContext,\n'MultimediaMessageMultimedia should have OverlayContext',\n);\n- return overlayContext.position;\n+ return overlayContext;\n}\ngetOpacity() {\n- const overlayPosition = MultimediaMessageMultimedia.getOverlayPosition(\n+ const overlayPosition = MultimediaMessageMultimedia.getOverlayContext(\nthis.props,\n- );\n- if (!overlayPosition) {\n- return;\n- }\n+ ).position;\nthis.opacity = block([\ncond(overlayJustCleared(overlayPosition), set(this.hidden, 0)),\nsub(\n@@ -154,30 +143,22 @@ class MultimediaMessageMultimedia extends React.PureComponent<Props> {\n]);\n}\n- static scrollDisabled(props: Props) {\n- const { scrollViewModalState } = props;\n- return (\n- !!scrollViewModalState && scrollViewModalState.modalState !== 'closed'\n- );\n- }\n-\ncomponentDidUpdate(prevProps: Props) {\n- const overlayPosition = MultimediaMessageMultimedia.getOverlayPosition(\n+ const overlayContext = MultimediaMessageMultimedia.getOverlayContext(\nthis.props,\n);\n- const prevOverlayPosition = MultimediaMessageMultimedia.getOverlayPosition(\n+ const prevOverlayContext = MultimediaMessageMultimedia.getOverlayContext(\nprevProps,\n);\n- if (overlayPosition !== prevOverlayPosition) {\n+\n+ if (overlayContext.position !== prevOverlayContext.position) {\nthis.getOpacity();\n}\n- const scrollIsDisabled = MultimediaMessageMultimedia.scrollDisabled(\n- this.props,\n- );\n- const scrollWasDisabled = MultimediaMessageMultimedia.scrollDisabled(\n- prevProps,\n- );\n+ const scrollIsDisabled =\n+ overlayContext.scrollBlockingModalStatus !== 'closed';\n+ const scrollWasDisabled =\n+ prevOverlayContext.scrollBlockingModalStatus !== 'closed';\nif (!scrollIsDisabled && scrollWasDisabled) {\nthis.clickable = true;\nthis.hidden.setValue(0);\n@@ -229,11 +210,12 @@ class MultimediaMessageMultimedia extends React.PureComponent<Props> {\n}\nthis.clickable = false;\n- const { scrollViewModalState, mediaInfo, item } = this.props;\n- if (scrollViewModalState) {\n- scrollViewModalState.setModalState('open');\n- }\n+ const overlayContext = MultimediaMessageMultimedia.getOverlayContext(\n+ this.props,\n+ );\n+ overlayContext.setScrollBlockingModalStatus('open');\n+ const { mediaInfo, item } = this.props;\nview.measure((x, y, width, height, pageX, pageY) => {\nconst coordinates = { x: pageX, y: pageY, width, height };\nthis.props.navigation.navigate({\n@@ -279,10 +261,10 @@ class MultimediaMessageMultimedia extends React.PureComponent<Props> {\ntoggleMessageFocus(messageKey(item.messageInfo));\n}\n- const { scrollViewModalState } = this.props;\n- if (scrollViewModalState) {\n- scrollViewModalState.setModalState('open');\n- }\n+ const overlayContext = MultimediaMessageMultimedia.getOverlayContext(\n+ this.props,\n+ );\n+ overlayContext.setScrollBlockingModalStatus('open');\nview.measure((x, y, width, height, pageX, pageY) => {\nconst coordinates = { x: pageX, y: pageY, width, height };\n@@ -343,8 +325,4 @@ const styles = StyleSheet.create({\nexport default connect((state: AppState) => ({\ncolors: colorsSelector(state),\n-}))(\n- withOverlayContext(\n- withKeyboardState(withScrollViewModalState(MultimediaMessageMultimedia)),\n- ),\n-);\n+}))(withOverlayContext(withKeyboardState(MultimediaMessageMultimedia)));\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/settings/thread-settings-member.react.js",
"new_path": "native/chat/settings/thread-settings-member.react.js",
"diff": "@@ -10,20 +10,10 @@ import {\nimport type { AppState } from '../../redux/redux-setup';\nimport type { LoadingStatus } from 'lib/types/loading-types';\nimport { loadingStatusPropType } from 'lib/types/loading-types';\n-import {\n- type ScrollViewModalState,\n- scrollViewModalStatePropType,\n- withScrollViewModalState,\n-} from '../../navigation/scroll-view-modal-state';\nimport {\ntype VerticalBounds,\nverticalBoundsPropType,\n} from '../../types/layout-types';\n-import {\n- type KeyboardState,\n- keyboardStatePropType,\n- withKeyboardState,\n-} from '../../keyboard/keyboard-state';\nimport {\ntype Navigate,\nThreadSettingsMemberTooltipModalRouteName,\n@@ -38,6 +28,7 @@ import {\nTouchableOpacity,\n} from 'react-native';\nimport PropTypes from 'prop-types';\n+import invariant from 'invariant';\nimport { threadHasPermission, memberIsAdmin } from 'lib/shared/thread-utils';\nimport { stringForUser } from 'lib/shared/user-utils';\n@@ -55,6 +46,16 @@ import {\ncolorsSelector,\nstyleSelector,\n} from '../../themes/colors';\n+import {\n+ type KeyboardState,\n+ keyboardStatePropType,\n+ withKeyboardState,\n+} from '../../keyboard/keyboard-state';\n+import {\n+ withOverlayContext,\n+ type OverlayContextType,\n+ overlayContextPropType,\n+} from '../../navigation/overlay-context';\ntype Props = {|\nmemberInfo: RelativeMemberInfo,\n@@ -69,10 +70,10 @@ type Props = {|\nchangeRoleLoadingStatus: LoadingStatus,\ncolors: Colors,\nstyles: typeof styles,\n- // withScrollViewModalState\n- scrollViewModalState: ?ScrollViewModalState,\n// withKeyboardState\nkeyboardState: ?KeyboardState,\n+ // withOverlayContext\n+ overlayContext: ?OverlayContextType,\n|};\nclass ThreadSettingsMember extends React.PureComponent<Props> {\nstatic propTypes = {\n@@ -87,8 +88,8 @@ class ThreadSettingsMember extends React.PureComponent<Props> {\nchangeRoleLoadingStatus: loadingStatusPropType.isRequired,\ncolors: colorsPropType.isRequired,\nstyles: PropTypes.objectOf(PropTypes.object).isRequired,\n- scrollViewModalState: scrollViewModalStatePropType,\nkeyboardState: keyboardStatePropType,\n+ overlayContext: overlayContextPropType,\n};\neditButton: ?View;\n@@ -232,10 +233,12 @@ class ThreadSettingsMember extends React.PureComponent<Props> {\nreturn;\n}\n- const { scrollViewModalState } = this.props;\n- if (scrollViewModalState) {\n- scrollViewModalState.setModalState('open');\n- }\n+ const { overlayContext } = this.props;\n+ invariant(\n+ overlayContext,\n+ 'ThreadSettingsMember should have OverlayContext',\n+ );\n+ overlayContext.setScrollBlockingModalStatus('open');\neditButton.measure((x, y, width, height, pageX, pageY) => {\nconst coordinates = { x: pageX, y: pageY, width, height };\n@@ -315,4 +318,4 @@ export default connect(\ncolors: colorsSelector(state),\nstyles: stylesSelector(state),\n}),\n-)(withKeyboardState(withScrollViewModalState(ThreadSettingsMember)));\n+)(withKeyboardState(withOverlayContext(ThreadSettingsMember)));\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/settings/thread-settings.react.js",
"new_path": "native/chat/settings/thread-settings.react.js",
"diff": "@@ -15,11 +15,6 @@ import type { AppState } from '../../redux/redux-setup';\nimport type { CategoryType } from './thread-settings-category.react';\nimport type { Navigate } from '../../navigation/route-names';\nimport type { VerticalBounds } from '../../types/layout-types';\n-import {\n- type ScrollViewModalState,\n- scrollViewModalStatePropType,\n- withScrollViewModalState,\n-} from '../../navigation/scroll-view-modal-state';\nimport React from 'react';\nimport PropTypes from 'prop-types';\n@@ -78,6 +73,11 @@ import {\nconnectNav,\ntype NavContextType,\n} from '../../navigation/navigation-context';\n+import {\n+ withOverlayContext,\n+ type OverlayContextType,\n+ overlayContextPropType,\n+} from '../../navigation/overlay-context';\nconst itemPageLength = 5;\n@@ -196,8 +196,8 @@ type Props = {|\nsomethingIsSaving: boolean,\ntabActive: boolean,\nstyles: typeof styles,\n- // withScrollViewModalState\n- scrollViewModalState: ?ScrollViewModalState,\n+ // withOverlayContext\n+ overlayContext: ?OverlayContextType,\n|};\ntype State = {|\nshowMaxMembers: number,\n@@ -228,7 +228,7 @@ class ThreadSettings extends React.PureComponent<Props, State> {\nsomethingIsSaving: PropTypes.bool.isRequired,\ntabActive: PropTypes.bool.isRequired,\nstyles: PropTypes.objectOf(PropTypes.object).isRequired,\n- scrollViewModalState: scrollViewModalStatePropType,\n+ overlayContext: overlayContextPropType,\n};\nstatic navigationOptions = ({ navigation }) => ({\ntitle: navigation.state.params.threadInfo.uiName,\n@@ -258,10 +258,9 @@ class ThreadSettings extends React.PureComponent<Props, State> {\n}\nstatic scrollDisabled(props: Props) {\n- const { scrollViewModalState } = props;\n- return (\n- !!scrollViewModalState && scrollViewModalState.modalState !== 'closed'\n- );\n+ const { overlayContext } = props;\n+ invariant(overlayContext, 'ThreadSettings should have OverlayContext');\n+ return overlayContext.scrollBlockingModalStatus !== 'closed';\n}\ncomponentDidMount() {\n@@ -852,7 +851,7 @@ const WrappedThreadSettings = connect(\n)(\nconnectNav((context: ?NavContextType) => ({\ntabActive: activeTabSelector(context),\n- }))(withScrollViewModalState(ThreadSettings)),\n+ }))(withOverlayContext(ThreadSettings)),\n);\nhoistNonReactStatics(WrappedThreadSettings, ThreadSettings);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/text-message.react.js",
"new_path": "native/chat/text-message.react.js",
"diff": "@@ -14,20 +14,11 @@ import {\ntype MessageListNavProp,\nmessageListNavPropType,\n} from './message-list-types';\n-import {\n- type ScrollViewModalState,\n- scrollViewModalStatePropType,\n- withScrollViewModalState,\n-} from '../navigation/scroll-view-modal-state';\n-import {\n- type KeyboardState,\n- keyboardStatePropType,\n- withKeyboardState,\n-} from '../keyboard/keyboard-state';\nimport * as React from 'react';\nimport { View } from 'react-native';\nimport PropTypes from 'prop-types';\n+import invariant from 'invariant';\nimport { messageKey } from 'lib/shared/message-utils';\n@@ -38,6 +29,16 @@ import { ComposedMessage, clusterEndHeight } from './composed-message.react';\nimport { authorNameHeight } from './message-header.react';\nimport { failedSendHeight } from './failed-send.react';\nimport textMessageSendFailed from './text-message-send-failed';\n+import {\n+ type KeyboardState,\n+ keyboardStatePropType,\n+ withKeyboardState,\n+} from '../keyboard/keyboard-state';\n+import {\n+ withOverlayContext,\n+ type OverlayContextType,\n+ overlayContextPropType,\n+} from '../navigation/overlay-context';\nexport type ChatTextMessageInfoItemWithHeight = {|\nitemType: 'message',\n@@ -73,10 +74,10 @@ type Props = {|\nfocused: boolean,\ntoggleFocus: (messageKey: string) => void,\nverticalBounds: ?VerticalBounds,\n- // withScrollViewModalState\n- scrollViewModalState: ?ScrollViewModalState,\n// withKeyboardState\nkeyboardState: ?KeyboardState,\n+ // withOverlayContext\n+ overlayContext: ?OverlayContextType,\n...React.ElementProps<typeof View>,\n|};\nclass TextMessage extends React.PureComponent<Props> {\n@@ -86,8 +87,8 @@ class TextMessage extends React.PureComponent<Props> {\nfocused: PropTypes.bool.isRequired,\ntoggleFocus: PropTypes.func.isRequired,\nverticalBounds: verticalBoundsPropType,\n- scrollViewModalState: scrollViewModalStatePropType,\nkeyboardState: keyboardStatePropType,\n+ overlayContext: overlayContextPropType,\n};\nmessage: ?View;\n@@ -98,8 +99,8 @@ class TextMessage extends React.PureComponent<Props> {\nfocused,\ntoggleFocus,\nverticalBounds,\n- scrollViewModalState,\nkeyboardState,\n+ overlayContext,\n...viewProps\n} = this.props;\nreturn (\n@@ -140,10 +141,9 @@ class TextMessage extends React.PureComponent<Props> {\ntoggleFocus(messageKey(item.messageInfo));\n}\n- const { scrollViewModalState } = this.props;\n- if (scrollViewModalState) {\n- scrollViewModalState.setModalState('open');\n- }\n+ const { overlayContext } = this.props;\n+ invariant(overlayContext, 'TextMessage should have OverlayContext');\n+ overlayContext.setScrollBlockingModalStatus('open');\nmessage.measure((x, y, width, height, pageX, pageY) => {\nconst coordinates = { x: pageX, y: pageY, width, height };\n@@ -189,8 +189,6 @@ class TextMessage extends React.PureComponent<Props> {\n};\n}\n-const WrappedTextMessage = withKeyboardState(\n- withScrollViewModalState(TextMessage),\n-);\n+const WrappedTextMessage = withKeyboardState(withOverlayContext(TextMessage));\nexport { WrappedTextMessage as TextMessage, textMessageItemHeight };\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/app-navigator.react.js",
"new_path": "native/navigation/app-navigator.react.js",
"diff": "@@ -33,7 +33,6 @@ import ActionResultModal from './action-result-modal.react';\nimport { TextMessageTooltipModal } from '../chat/text-message-tooltip-modal.react';\nimport ThreadSettingsMemberTooltipModal from '../chat/settings/thread-settings-member-tooltip-modal.react';\nimport CameraModal from '../media/camera-modal.react';\n-import ScrollViewModalStateContainer from './scroll-view-modal-state-container.react';\nimport KeyboardStateContainer from '../keyboard/keyboard-state-container.react';\nimport PushHandler from '../push/push-handler.react';\nimport { getPersistor } from '../redux/persist';\n@@ -88,14 +87,12 @@ function WrappedAppNavigator(props: Props) {\nconst { navigation } = props;\nreturn (\n- <ScrollViewModalStateContainer>\n<KeyboardStateContainer>\n<AppNavigator navigation={navigation} />\n<PersistGate persistor={getPersistor()}>\n<PushHandler navigation={navigation} />\n</PersistGate>\n</KeyboardStateContainer>\n- </ScrollViewModalStateContainer>\n);\n}\nhoistNonReactStatics(WrappedAppNavigator, AppNavigator);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-context.js",
"new_path": "native/navigation/overlay-context.js",
"diff": "@@ -4,7 +4,7 @@ import * as React from 'react';\nimport Animated from 'react-native-reanimated';\nimport PropTypes from 'prop-types';\n-export type ScrollBlockingModalStatus = 'open' | 'closed' | 'closing';\n+type ScrollBlockingModalStatus = 'open' | 'closed' | 'closing';\nexport type OverlayContextType = {|\nposition: Animated.Value,\nisDismissing: boolean,\n"
},
{
"change_type": "DELETE",
"old_path": "native/navigation/scroll-view-modal-state-container.react.js",
"new_path": null,
"diff": "-// @flow\n-\n-import * as React from 'react';\n-import PropTypes from 'prop-types';\n-\n-import {\n- scrollBlockingChatModalsClosedSelector,\n- overlayModalClosingSelector,\n-} from './nav-selectors';\n-import {\n- ScrollViewModalContext,\n- type ScrollViewModalStatus,\n-} from './scroll-view-modal-state';\n-import { connectNav, type NavContextType } from './navigation-context';\n-\n-type Props = {|\n- children: React.Node,\n- // Redux state\n- scrollBlockingModalsClosed: boolean,\n- scrollBlockingModalsGone: boolean,\n-|};\n-type State = {|\n- modalState: ScrollViewModalStatus,\n-|};\n-class ScrollViewModalStateContainer extends React.PureComponent<Props, State> {\n- static propTypes = {\n- children: PropTypes.node.isRequired,\n- scrollBlockingModalsClosed: PropTypes.bool.isRequired,\n- scrollBlockingModalsGone: PropTypes.bool.isRequired,\n- };\n-\n- constructor(props: Props) {\n- super(props);\n- this.state = {\n- modalState: props.scrollBlockingModalsClosed ? 'closed' : 'open',\n- };\n- }\n-\n- componentDidUpdate(prevProps: Props) {\n- if (\n- this.state.modalState !== 'closed' &&\n- this.props.scrollBlockingModalsGone &&\n- !prevProps.scrollBlockingModalsGone\n- ) {\n- this.setModalState('closed');\n- } else if (\n- this.state.modalState !== 'open' &&\n- !this.props.scrollBlockingModalsClosed &&\n- prevProps.scrollBlockingModalsClosed\n- ) {\n- this.setModalState('open');\n- } else if (\n- this.state.modalState === 'open' &&\n- this.props.scrollBlockingModalsClosed &&\n- !prevProps.scrollBlockingModalsClosed\n- ) {\n- this.setModalState('closing');\n- }\n- }\n-\n- setModalState = (modalState: ScrollViewModalStatus) => {\n- this.setState({ modalState });\n- };\n-\n- render() {\n- const scrollViewModalState = {\n- modalState: this.state.modalState,\n- setModalState: this.setModalState,\n- };\n- return (\n- <ScrollViewModalContext.Provider value={scrollViewModalState}>\n- {this.props.children}\n- </ScrollViewModalContext.Provider>\n- );\n- }\n-}\n-\n-export default connectNav((context: ?NavContextType) => {\n- const scrollBlockingModalsClosed = scrollBlockingChatModalsClosedSelector(\n- context,\n- );\n- return {\n- scrollBlockingModalsClosed,\n- scrollBlockingModalsGone:\n- scrollBlockingModalsClosed && !overlayModalClosingSelector(context),\n- };\n-})(ScrollViewModalStateContainer);\n"
},
{
"change_type": "DELETE",
"old_path": "native/navigation/scroll-view-modal-state.js",
"new_path": null,
"diff": "-// @flow\n-\n-import * as React from 'react';\n-import PropTypes from 'prop-types';\n-\n-export type ScrollViewModalStatus = 'open' | 'closed' | 'closing';\n-\n-export type ScrollViewModalState = {|\n- modalState: ScrollViewModalStatus,\n- setModalState: (modalState: ScrollViewModalStatus) => void,\n-|};\n-\n-const scrollViewModalStatePropType = PropTypes.shape({\n- modalState: PropTypes.oneOf(['open', 'closed', 'closing']).isRequired,\n- setModalState: PropTypes.func.isRequired,\n-});\n-\n-const ScrollViewModalContext = React.createContext<?ScrollViewModalState>(null);\n-\n-function withScrollViewModalState<\n- AllProps: {},\n- ComponentType: React.ComponentType<AllProps>,\n->(\n- Component: ComponentType,\n-): React.ComponentType<\n- $Diff<\n- React.ElementConfig<ComponentType>,\n- { scrollViewModalState: ?ScrollViewModalState },\n- >,\n-> {\n- class ScrollViewModalStateHOC extends React.PureComponent<\n- $Diff<\n- React.ElementConfig<ComponentType>,\n- { scrollViewModalState: ?ScrollViewModalState },\n- >,\n- > {\n- render() {\n- return (\n- <ScrollViewModalContext.Consumer>\n- {value => <Component {...this.props} scrollViewModalState={value} />}\n- </ScrollViewModalContext.Consumer>\n- );\n- }\n- }\n- return ScrollViewModalStateHOC;\n-}\n-\n-export {\n- scrollViewModalStatePropType,\n- ScrollViewModalContext,\n- withScrollViewModalState,\n-};\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Replace ScrollViewModalContext with OverlayContext |
129,187 | 08.05.2020 13:52:01 | 14,400 | 144b7f6e5c6150ccd5091532ed3b6859fd20de3e | [native] Update packages for React Navigation 5 | [
{
"change_type": "MODIFY",
"old_path": "native/ios/Podfile.lock",
"new_path": "native/ios/Podfile.lock",
"diff": "@@ -245,6 +245,8 @@ PODS:\n- React\n- react-native-orientation-locker (1.1.6):\n- React\n+ - react-native-safe-area-context (0.7.3):\n+ - React\n- react-native-splash-screen (3.2.0):\n- React\n- react-native-video/Video (5.0.2):\n@@ -299,6 +301,8 @@ PODS:\n- React\n- RNCAsyncStorage (1.6.2):\n- React\n+ - RNCMaskedView (0.1.10):\n+ - React\n- RNExitApp (1.1.0):\n- React\n- RNFastImage (7.0.2):\n@@ -313,7 +317,7 @@ PODS:\n- React\n- RNReanimated (1.8.0):\n- React\n- - RNScreens (1.0.0-alpha.17):\n+ - RNScreens (2.7.0):\n- React\n- RNVectorIcons (6.6.0):\n- React\n@@ -378,6 +382,7 @@ DEPENDENCIES:\n- react-native-notifications (from `../../node_modules/react-native-notifications`)\n- react-native-onepassword (from `../../node_modules/react-native-onepassword`)\n- react-native-orientation-locker (from `../../node_modules/react-native-orientation-locker`)\n+ - react-native-safe-area-context (from `../../node_modules/react-native-safe-area-context`)\n- react-native-splash-screen (from `../../node_modules/react-native-splash-screen`)\n- react-native-video/VideoCaching (from `../../node_modules/react-native-video/react-native-video.podspec`)\n- React-RCTActionSheet (from `../../node_modules/react-native/Libraries/ActionSheetIOS`)\n@@ -396,6 +401,7 @@ DEPENDENCIES:\n- ReactNativeKeyboardInput (from `../../node_modules/react-native-keyboard-input`)\n- ReactNativeKeyboardTrackingView (from `../../node_modules/react-native-keyboard-tracking-view`)\n- \"RNCAsyncStorage (from `../../node_modules/@react-native-community/async-storage`)\"\n+ - \"RNCMaskedView (from `../../node_modules/@react-native-community/masked-view`)\"\n- RNExitApp (from `../../node_modules/react-native-exit-app`)\n- RNFastImage (from `../../node_modules/react-native-fast-image`)\n- RNFS (from `../../node_modules/react-native-fs`)\n@@ -495,6 +501,8 @@ EXTERNAL SOURCES:\n:path: \"../../node_modules/react-native-onepassword\"\nreact-native-orientation-locker:\n:path: \"../../node_modules/react-native-orientation-locker\"\n+ react-native-safe-area-context:\n+ :path: \"../../node_modules/react-native-safe-area-context\"\nreact-native-splash-screen:\n:path: \"../../node_modules/react-native-splash-screen\"\nreact-native-video:\n@@ -529,6 +537,8 @@ EXTERNAL SOURCES:\n:path: \"../../node_modules/react-native-keyboard-tracking-view\"\nRNCAsyncStorage:\n:path: \"../../node_modules/@react-native-community/async-storage\"\n+ RNCMaskedView:\n+ :path: \"../../node_modules/@react-native-community/masked-view\"\nRNExitApp:\n:path: \"../../node_modules/react-native-exit-app\"\nRNFastImage:\n@@ -616,6 +626,7 @@ SPEC CHECKSUMS:\nreact-native-notifications: bb042206ac7eab9323d528c780b3d6fe796c1f5e\nreact-native-onepassword: 5b2b7f425f9db40932703e65d350b78cbc598047\nreact-native-orientation-locker: 23918c400376a7043e752c639c122fcf6bce8f1c\n+ react-native-safe-area-context: e200d4433aba6b7e60b52da5f37af11f7a0b0392\nreact-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865\nreact-native-video: d01ed7ff1e38fa7dcc6c15c94cf505e661b7bfd0\nReact-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76\n@@ -633,13 +644,14 @@ SPEC CHECKSUMS:\nReactNativeKeyboardInput: c37e26821519869993b3b61844350feb9177ff37\nReactNativeKeyboardTrackingView: 02137fac3b2ebd330d74fa54ead48b14750a2306\nRNCAsyncStorage: 60a80e72d95bf02a01cace55d3697d9724f0d77f\n+ RNCMaskedView: 5a8ec07677aa885546a0d98da336457e2bea557f\nRNExitApp: c4e052df2568b43bec8a37c7cd61194d4cfee2c3\nRNFastImage: 9b0c22643872bb7494c8d87bbbb66cc4c0d9e7a2\nRNFS: 54da03c2b7d862c42ea3ca8c7f86f892760a535a\nRNGestureHandler: 8f09cd560f8d533eb36da5a6c5a843af9f056b38\nRNKeychain: 45dbd50d1ac4bd42c3740f76ffb135abf05746d0\nRNReanimated: 955cf4068714003d2f1a6e2bae3fb1118f359aff\n- RNScreens: 000c9e6e31c9a483688943155107e4ca9394d37a\n+ RNScreens: cf198f915f8a2bf163de94ca9f5bfc8d326c3706\nRNVectorIcons: 0bb4def82230be1333ddaeee9fcba45f0b288ed4\nSDWebImage: d9ea4959d99c52276dfada481987018fcaea3d58\nSDWebImageWebPCoder: 947093edd1349d820c40afbd9f42acb6cdecd987\n"
},
{
"change_type": "MODIFY",
"old_path": "native/package.json",
"new_path": "native/package.json",
"diff": "\"@react-native-community/art\": \"^1.1.2\",\n\"@react-native-community/async-storage\": \"^1.6.1\",\n\"@react-native-community/cameraroll\": \"^1.5.2\",\n+ \"@react-native-community/masked-view\": \"^0.1.10\",\n\"@react-native-community/netinfo\": \"^4.4.0\",\n+ \"@react-navigation/bottom-tabs\": \"^5.4.1\",\n+ \"@react-navigation/native\": \"^5.2.6\",\n+ \"@react-navigation/stack\": \"^5.3.1\",\n\"base-64\": \"^0.1.0\",\n\"expo-image-manipulator\": \"^8.1.0\",\n\"expo-media-library\": \"^8.1.0\",\n\"react-native-orientation-locker\": \"^1.1.6\",\n\"react-native-progress\": \"^4.0.3\",\n\"react-native-reanimated\": \"^1.8.0\",\n- \"react-native-screens\": \"1.0.0-alpha.17\",\n+ \"react-native-safe-area-context\": \"^0.7.3\",\n+ \"react-native-screens\": \"^2.7.0\",\n\"react-native-splash-screen\": \"^3.2.0\",\n\"react-native-unimodules\": \"^0.9.0\",\n\"react-native-vector-icons\": \"^6.6.0\",\n\"react-native-video\": \"^5.0.2\",\n- \"react-navigation\": \"^4.0.6\",\n- \"react-navigation-stack\": \"^1.10.2\",\n- \"react-navigation-tabs\": \"^2.5.4\",\n\"react-redux\": \"^7.1.1\",\n\"reactotron-react-native\": \"^4.0.2\",\n\"reactotron-redux\": \"^3.1.1\",\n"
},
{
"change_type": "MODIFY",
"old_path": "yarn.lock",
"new_path": "yarn.lock",
"diff": "wcwidth \"^1.0.1\"\nws \"^1.1.0\"\n+\"@react-native-community/masked-view@^0.1.10\":\n+ version \"0.1.10\"\n+ resolved \"https://registry.yarnpkg.com/@react-native-community/masked-view/-/masked-view-0.1.10.tgz#5dda643e19e587793bc2034dd9bf7398ad43d401\"\n+ integrity sha512-rk4sWFsmtOw8oyx8SD3KSvawwaK7gRBSEIy2TAwURyGt+3TizssXP1r8nx3zY+R7v2vYYHXZ+k2/GULAT/bcaQ==\n+\n\"@react-native-community/netinfo@^4.4.0\":\nversion \"4.4.0\"\nresolved \"https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-4.4.0.tgz#a18eb9ba082b6aca6add004b4a918250ad7d13bc\"\nintegrity sha512-qqNWMOsrDjj/daqV21ID2T8mNUjZD4pdx3PuWyE65gzKh2w+oMnzKb+J0NbLyZPn3wwLwU1+Cpf58A0ff5szjQ==\n-\"@react-navigation/core@^3.5.1\":\n- version \"3.5.1\"\n- resolved \"https://registry.yarnpkg.com/@react-navigation/core/-/core-3.5.1.tgz#7a2339fca3496979305fb3a8ab88c2ca8d8c214d\"\n- integrity sha512-q7NyhWVYOhVIWqL2GZKa6G78YarXaVTTtOlSDkvy4ZIggo40wZzamlnrJRvsaQX46gsgw45FAWb5SriHh8o7eA==\n+\"@react-navigation/bottom-tabs@^5.4.1\":\n+ version \"5.4.1\"\n+ resolved \"https://registry.yarnpkg.com/@react-navigation/bottom-tabs/-/bottom-tabs-5.4.1.tgz#85eef2c942658f491cf5f056db4f0ba36e953f03\"\n+ integrity sha512-5BrxcIZMMQf+KKRDg1o7Qm008nZU4rCGoxspMGGaSFrOxFQo38Nivt7kyunQNYVpkRy6/NPpOOTcvkIMtLLXNA==\ndependencies:\n- hoist-non-react-statics \"^3.3.0\"\n- path-to-regexp \"^1.7.0\"\n- query-string \"^6.4.2\"\n- react-is \"^16.8.6\"\n+ color \"^3.1.2\"\n+ react-native-iphone-x-helper \"^1.2.1\"\n-\"@react-navigation/native@^3.6.2\":\n- version \"3.6.2\"\n- resolved \"https://registry.yarnpkg.com/@react-navigation/native/-/native-3.6.2.tgz#3634697b6350cc5189657ae4551f2d52b57fbbf0\"\n- integrity sha512-Cybeou6N82ZeRmgnGlu+wzlV3z5BZQR2dmYaNFV1TNLUGHqtvv8E7oNw9uYcz9Ox5LFbiX+FdNTn2d6ZPlK0kg==\n+\"@react-navigation/core@^5.5.2\":\n+ version \"5.5.2\"\n+ resolved \"https://registry.yarnpkg.com/@react-navigation/core/-/core-5.5.2.tgz#14e844287225fe7a41b471262f282ecd2d0404ea\"\n+ integrity sha512-nYPDpwPVZ3+S8YSj5ktMKgxQq9B298An4nfDhIobLNqMifvTXC15kWTPbMAWSYdwZr5tbw7SniP6+jXFZgfIlQ==\ndependencies:\n- hoist-non-react-statics \"^3.0.1\"\n- react-native-safe-area-view \"^0.14.1\"\n- react-native-screens \"^1.0.0 || ^1.0.0-alpha\"\n+ \"@react-navigation/routers\" \"^5.4.4\"\n+ escape-string-regexp \"^4.0.0\"\n+ nanoid \"^3.1.5\"\n+ query-string \"^6.12.1\"\n+ react-is \"^16.13.0\"\n+ use-subscription \"^1.4.0\"\n+\n+\"@react-navigation/native@^5.2.6\":\n+ version \"5.2.6\"\n+ resolved \"https://registry.yarnpkg.com/@react-navigation/native/-/native-5.2.6.tgz#e17f89a1939b8f2bebcc0e8a87dfe68ff3a9c995\"\n+ integrity sha512-j4oPs5fjD8jm8n2tDc7zyXrqa3RmE+iiQUUmdhi2yEMs6YUGCiON7AyZiJGONKQ+GCzyVfK1GHyVtnihvKvp3w==\n+ dependencies:\n+ \"@react-navigation/core\" \"^5.5.2\"\n+\n+\"@react-navigation/routers@^5.4.4\":\n+ version \"5.4.4\"\n+ resolved \"https://registry.yarnpkg.com/@react-navigation/routers/-/routers-5.4.4.tgz#3b5e1a55edb73a506a82db59081ad434c0ce1aab\"\n+ integrity sha512-Q8ZIubVYc1569JOs2oMWbhNXBNzZHvRfP5cEZ6/ksj9cPF7DkwOXsAdF0b+Oe0ei0f7OaK9LTRmfiNdtAPWVzw==\n+ dependencies:\n+ nanoid \"^3.1.5\"\n+\n+\"@react-navigation/stack@^5.3.1\":\n+ version \"5.3.1\"\n+ resolved \"https://registry.yarnpkg.com/@react-navigation/stack/-/stack-5.3.1.tgz#7810b0e16faadce181a5a718002addc8b2680839\"\n+ integrity sha512-LACbV6TaVwIOfJCfq4sHUYdfMm1JgtT6d3bfFFJk8hub8VQtHYdm9YdpKVk28uJbNGFqBIr4lqekM0uqZgJ+Kw==\n+ dependencies:\n+ color \"^3.1.2\"\n+ react-native-iphone-x-helper \"^1.2.1\"\n\"@samverschueren/stream-to-observable@^0.3.0\":\nversion \"0.3.0\"\n@@ -4753,11 +4781,6 @@ dayjs@^1.8.15:\nresolved \"https://registry.yarnpkg.com/dayjs/-/dayjs-1.8.16.tgz#2a3771de537255191b947957af2fd90012e71e64\"\nintegrity sha512-XPmqzWz/EJiaRHjBqSJ2s6hE/BUoCIHKgdS2QPtTQtKcS9E4/Qn0WomoH1lXanWCzri+g7zPcuNV4aTZ8PMORQ==\n-debounce@^1.2.0:\n- version \"1.2.0\"\n- resolved \"https://registry.yarnpkg.com/debounce/-/debounce-1.2.0.tgz#44a540abc0ea9943018dc0eaa95cce87f65cd131\"\n- integrity sha512-mYtLl1xfZLi1m4RtQYlZgJUNQjl4ZxVnHzIR8nLLgi4q1YT8o/WM+MK/f8yfcc9s5Ir5zRaPZyZU6xs1Syoocg==\n-\ndebug-logger@0.4.1:\nversion \"0.4.1\"\nresolved \"https://registry.yarnpkg.com/debug-logger/-/debug-logger-0.4.1.tgz#e33849c369e3cd361b50b299d71ca5224baa1ae1\"\n@@ -5373,6 +5396,11 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3, escape-string-regexp@^\nresolved \"https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4\"\nintegrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=\n+escape-string-regexp@^4.0.0:\n+ version \"4.0.0\"\n+ resolved \"https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34\"\n+ integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==\n+\nescodegen@^1.9.1:\nversion \"1.12.0\"\nresolved \"https://registry.yarnpkg.com/escodegen/-/escodegen-1.12.0.tgz#f763daf840af172bb3a2b6dd7219c0e17f7ff541\"\n@@ -6952,7 +6980,7 @@ hoist-non-react-statics@^2.3.1:\nresolved \"https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47\"\nintegrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==\n-hoist-non-react-statics@^3.0.1, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0:\n+hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0:\nversion \"3.3.0\"\nresolved \"https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b\"\nintegrity sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==\n@@ -9720,6 +9748,11 @@ nan@^2.12.1:\nresolved \"https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c\"\nintegrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==\n+nanoid@^3.1.5:\n+ version \"3.1.6\"\n+ resolved \"https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.6.tgz#f591cc886c14e5b2c4da753db0ac547fac1fee6a\"\n+ integrity sha512-Kp/sUTkDjStVFvT4W0OO1Z1jJWhnxIa1TNJ1F+G27IPC+FOc3aqbX8OMptcZE4vRrzREjttOHut5PbC11F7KBQ==\n+\nnanomatch@^1.2.9:\nversion \"1.2.13\"\nresolved \"https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119\"\n@@ -11419,10 +11452,10 @@ query-string@^5.0.1:\nobject-assign \"^4.1.0\"\nstrict-uri-encode \"^1.0.0\"\n-query-string@^6.4.2:\n- version \"6.8.3\"\n- resolved \"https://registry.yarnpkg.com/query-string/-/query-string-6.8.3.tgz#fd9fb7ffb068b79062b43383685611ee47777d4b\"\n- integrity sha512-llcxWccnyaWlODe7A9hRjkvdCKamEKTh+wH8ITdTc3OhchaqUZteiSCX/2ablWHVrkVIe04dntnaZJ7BdyW0lQ==\n+query-string@^6.12.1:\n+ version \"6.12.1\"\n+ resolved \"https://registry.yarnpkg.com/query-string/-/query-string-6.12.1.tgz#2ae4d272db4fba267141665374e49a1de09e8a7c\"\n+ integrity sha512-OHj+zzfRMyj3rmo/6G8a5Ifvw3AleL/EbcHMD27YA31Q+cO5lfmQxECkImuNVjcskLcvBRVHNAB3w6udMs1eAA==\ndependencies:\ndecode-uri-component \"^0.2.0\"\nsplit-on-first \"^1.0.0\"\n@@ -11564,12 +11597,12 @@ react-html-email@^3.0.0:\ndependencies:\nprop-types \"^15.5.10\"\n-react-is@^16.12.0:\n+react-is@^16.12.0, react-is@^16.13.0:\nversion \"16.13.1\"\nresolved \"https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4\"\nintegrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==\n-react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6, react-is@^16.9.0:\n+react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.9.0:\nversion \"16.10.2\"\nresolved \"https://registry.yarnpkg.com/react-is/-/react-is-16.10.2.tgz#984120fd4d16800e9a738208ab1fba422d23b5ab\"\nintegrity sha512-INBT1QEgtcCCgvccr5/86CfD71fw9EPmDxgiJX4I2Ddr6ZsV6iFXsuby+qWJPtmNuMY0zByTsG4468P7nHuNWA==\n@@ -11668,6 +11701,11 @@ react-native-in-app-message@^1.0.2:\nresolved \"https://registry.yarnpkg.com/react-native-in-app-message/-/react-native-in-app-message-1.0.2.tgz#e971c039bcd0e238306f73fbea43fc866aa94a69\"\nintegrity sha512-dbzC3AMT5CzGafzUu8ifFMd5g6v0Ww5q9oQgw8RRqjMhggoXDipct9BBI9g4tAoUB2xE2axqu2tKC5pnpBnbdQ==\n+react-native-iphone-x-helper@^1.2.1:\n+ version \"1.2.1\"\n+ resolved \"https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.2.1.tgz#645e2ffbbb49e80844bb4cbbe34a126fda1e6772\"\n+ integrity sha512-/VbpIEp8tSNNHIvstuA3Swx610whci1Zpc9mqNkqn14DkMbw+ORviln2u0XyHG1kPvvwTNGZY6QpeFwxYaSdbQ==\n+\nreact-native-keyboard-input@^6.0.0:\nversion \"6.0.0\"\nresolved \"https://registry.yarnpkg.com/react-native-keyboard-input/-/react-native-keyboard-input-6.0.0.tgz#db71ddc8f7c6fdb799b17b9ebdeb783c7ca55c08\"\n@@ -11719,12 +11757,10 @@ react-native-reanimated@^1.8.0:\ndependencies:\nfbjs \"^1.0.0\"\n-react-native-safe-area-view@^0.14.1, react-native-safe-area-view@^0.14.6:\n- version \"0.14.8\"\n- resolved \"https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.8.tgz#ef33c46ff8164ae77acad48c3039ec9c34873e5b\"\n- integrity sha512-MtRSIcZNstxv87Jet+UsPhEd1tpGe8cVskDXlP657x6rHpSrbrc+y13ZNXrwAgGNNhqQNX7UJT68ZIq//ZRmvw==\n- dependencies:\n- hoist-non-react-statics \"^2.3.1\"\n+react-native-safe-area-context@^0.7.3:\n+ version \"0.7.3\"\n+ resolved \"https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-0.7.3.tgz#ad6bd4abbabe195332c53810e4ce5851eb21aa2a\"\n+ integrity sha512-9Uqu1vlXPi+2cKW/CW6OnHxA76mWC4kF3wvlqzq4DY8hn37AeiXtLFs2WkxH4yXQRrnJdP6ivc65Lz+MqwRZAA==\nreact-native-safe-modules@^1.0.0:\nversion \"1.0.0\"\n@@ -11733,28 +11769,16 @@ react-native-safe-modules@^1.0.0:\ndependencies:\ndedent \"^0.6.0\"\n-react-native-screens@1.0.0-alpha.17:\n- version \"1.0.0-alpha.17\"\n- resolved \"https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-1.0.0-alpha.17.tgz#8c1a7224b967c476670963fce7d06b946e7158e9\"\n- integrity sha512-BvLtqbMpteXsY3XofCCX0c2LM6X14PhjN5FZraROEXuEnw8n8ImDTuXxUPDYZqq2Wjb1bLlm1zE5+c6dcGlY+Q==\n-\n-\"react-native-screens@^1.0.0 || ^1.0.0-alpha\":\n- version \"1.0.0-alpha.23\"\n- resolved \"https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-1.0.0-alpha.23.tgz#25d7ea4d11bda4fcde2d1da7ae50271c6aa636e0\"\n- integrity sha512-tOxHGQUN83MTmQB4ghoQkibqOdGiX4JQEmeyEv96MKWO/x8T2PJv84ECUos9hD3blPRQwVwSpAid1PPPhrVEaw==\n- dependencies:\n- debounce \"^1.2.0\"\n+react-native-screens@^2.7.0:\n+ version \"2.7.0\"\n+ resolved \"https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-2.7.0.tgz#2d3cf3c39a665e9ca1c774264fccdb90e7944047\"\n+ integrity sha512-n/23IBOkrTKCfuUd6tFeRkn3lB2QZ3cmvoubRscR0JU/Zl4/ZyKmwnFmUv1/Fr+2GH/H8UTX59kEKDYYg3dMgA==\nreact-native-splash-screen@^3.2.0:\nversion \"3.2.0\"\nresolved \"https://registry.yarnpkg.com/react-native-splash-screen/-/react-native-splash-screen-3.2.0.tgz#d47ec8557b1ba988ee3ea98d01463081b60fff45\"\nintegrity sha512-Ls9qiNZzW/OLFoI25wfjjAcrf2DZ975hn2vr6U9gyuxi2nooVbzQeFoQS5vQcbCt9QX5NY8ASEEAtlLdIa6KVg==\n-react-native-tab-view@^2.9.0:\n- version \"2.10.0\"\n- resolved \"https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-2.10.0.tgz#5e249e5650502010013449ffd4e5edc18a95364b\"\n- integrity sha512-qgexVz5eO4yaFjdkmn/sURXgVvaBo6pZD/q1eoca96SbPVbaH3WzVhF3bRUfeTHwZkXwznFTpS3JURqIFU8vQA==\n-\nreact-native-unimodules@^0.9.0:\nversion \"0.9.0\"\nresolved \"https://registry.yarnpkg.com/react-native-unimodules/-/react-native-unimodules-0.9.0.tgz#5ce642ac50d124b9d41c09ff7cb397e22f1110ea\"\n@@ -11833,31 +11857,6 @@ react-native@0.61.5:\nstacktrace-parser \"^0.1.3\"\nwhatwg-fetch \"^3.0.0\"\n-react-navigation-stack@^1.10.2:\n- version \"1.10.2\"\n- resolved \"https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-1.10.2.tgz#86521ec876ce030b54073b89d31d3a1d82e6675b\"\n- integrity sha512-dLyhLX0EM53grtsuzjl3azatCVr9ZdK/I/ZzW6c9GSqwXwFTJ+XL4z9kbIXoviMb9qXbLRpVhSR9eAlpsmPZUw==\n- dependencies:\n- prop-types \"^15.7.2\"\n-\n-react-navigation-tabs@^2.5.4:\n- version \"2.5.5\"\n- resolved \"https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-2.5.5.tgz#f651355b140b35ef5753aac434da5e1943abdd26\"\n- integrity sha512-oIL5V4agCxcqbWNZzF1h/cm1bxKXNUeGrWaRQEEnuN3TXTEj1SVRz33CnKYg30pVvgF5L2p28sOk15Z4Ao01NQ==\n- dependencies:\n- hoist-non-react-statics \"^3.3.0\"\n- react-lifecycles-compat \"^3.0.4\"\n- react-native-safe-area-view \"^0.14.6\"\n- react-native-tab-view \"^2.9.0\"\n-\n-react-navigation@^4.0.6:\n- version \"4.0.10\"\n- resolved \"https://registry.yarnpkg.com/react-navigation/-/react-navigation-4.0.10.tgz#ddf41134600689d6ba99e35dd22ba1f664f91e5c\"\n- integrity sha512-7PqvmsdQ7HIyxPUMYbd9Uq//VoMdniEOLAOSvIhb/ExtbAt/1INSjUF+RiMWOMCWLTCNvNPRvTz7xy7qwWureg==\n- dependencies:\n- \"@react-navigation/core\" \"^3.5.1\"\n- \"@react-navigation/native\" \"^3.6.2\"\n-\nreact-redux@^7.1.1:\nversion \"7.1.1\"\nresolved \"https://registry.yarnpkg.com/react-redux/-/react-redux-7.1.1.tgz#ce6eee1b734a7a76e0788b3309bf78ff6b34fa0a\"\n@@ -14261,6 +14260,13 @@ url@^0.11.0:\npunycode \"1.3.2\"\nquerystring \"0.2.0\"\n+use-subscription@^1.4.0:\n+ version \"1.4.1\"\n+ resolved \"https://registry.yarnpkg.com/use-subscription/-/use-subscription-1.4.1.tgz#edcbcc220f1adb2dd4fa0b2f61b6cc308e620069\"\n+ integrity sha512-7+IIwDG/4JICrWHL/Q/ZPK5yozEnvRm6vHImu0LKwQlmWGKeiF7mbAenLlK/cTNXrTtXHU/SFASQHzB6+oSJMQ==\n+ dependencies:\n+ object-assign \"^4.1.1\"\n+\nuse@^3.1.0:\nversion \"3.1.1\"\nresolved \"https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f\"\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Update packages for React Navigation 5 |
129,187 | 09.05.2020 10:26:19 | 14,400 | 206ef02fa9248d17c7629ea4377bbc6dee6d61e9 | [native] useScreens -> enableScreens | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/root-navigator.react.js",
"new_path": "native/navigation/root-navigator.react.js",
"diff": "@@ -15,7 +15,7 @@ import {\ntype NavigationStackTransitionProps,\n} from 'react-navigation-stack';\nimport { Keyboard } from 'react-native';\n-import { useScreens } from 'react-native-screens';\n+import { enableScreens } from 'react-native-screens';\nimport {\nLoggedOutModalRouteName,\n@@ -38,8 +38,7 @@ import ColorPickerModal from '../chat/settings/color-picker-modal.react';\nimport ComposeSubthreadModal from '../chat/settings/compose-subthread-modal.react';\nimport RootRouter from './root-router';\n-// eslint-disable-next-line react-hooks/rules-of-hooks\n-useScreens();\n+enableScreens();\ntype NavigationProp = NavigationStackProp<NavigationState> & {\nlogIn: () => void,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] useScreens -> enableScreens |
129,187 | 11.05.2020 23:05:58 | 14,400 | 3edb2fc1acf2f884eecfbe7f3e978ec273cd653d | [native] Get rid of unused navigation prop in LoggedOutModal | [
{
"change_type": "MODIFY",
"old_path": "native/account/logged-out-modal.react.js",
"new_path": "native/account/logged-out-modal.react.js",
"diff": "// @flow\n-import type { NavigationScreenProp, NavigationRoute } from 'react-navigation';\nimport type { DispatchActionPayload } from 'lib/utils/action-utils';\nimport type { Dispatch } from 'lib/types/redux-types';\nimport type { AppState } from '../redux/redux-setup';\n@@ -76,7 +75,6 @@ const animatedSpec = {\ntype LoggedOutMode = 'loading' | 'prompt' | 'log-in' | 'register';\ntype Props = {\n- navigation: NavigationScreenProp<NavigationRoute>,\n// Navigation state\nisForeground: boolean,\nnavContext: ?NavContextType,\n@@ -106,10 +104,6 @@ type State = {\nclass LoggedOutModal extends React.PureComponent<Props, State> {\nstatic propTypes = {\n- navigation: PropTypes.shape({\n- navigate: PropTypes.func.isRequired,\n- goBack: PropTypes.func.isRequired,\n- }).isRequired,\nisForeground: PropTypes.bool.isRequired,\nnavContext: navContextPropType,\nrehydrateConcluded: PropTypes.bool.isRequired,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Get rid of unused navigation prop in LoggedOutModal |
129,187 | 11.05.2020 23:25:06 | 14,400 | 7f7c5083ccd930c187841d2fab95f56e5ff1e442 | [native] Add notice explaining themes/fonts.js existence | [
{
"change_type": "MODIFY",
"old_path": "native/themes/fonts.js",
"new_path": "native/themes/fonts.js",
"diff": "@@ -6,6 +6,8 @@ import IonIcon from 'react-native-vector-icons/Ionicons';\nimport MaterialCommunityIcon from 'react-native-vector-icons/MaterialCommunityIcons';\nimport MaterialIcon from 'react-native-vector-icons/MaterialIcons';\n+// This is only necessary on iOS if we switch to use_frameworks\n+// We're keeping it here in case we ever do that again\nFeatherIcon.loadFont();\nFontAwesomeIcon.loadFont();\nIonIcon.loadFont();\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Add notice explaining themes/fonts.js existence |
129,187 | 11.05.2020 23:25:54 | 14,400 | 71f492908f014ac73af7dca242346d4faf7e3d50 | [native] Update OverlayNavigator custom navigator to React Nav 5 | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-navigator.react.js",
"new_path": "native/navigation/overlay-navigator.react.js",
"diff": "// @flow\n-import type {\n- NavigationStackProp,\n- NavigationState,\n- NavigationDescriptor,\n- NavigationRouteConfigMap,\n- StackNavigatorConfig,\n-} from 'react-navigation-stack';\n-import type { NavigationStackScreenOptions } from 'react-navigation';\n-\nimport * as React from 'react';\nimport { View, StyleSheet } from 'react-native';\nimport { createNavigator } from 'react-navigation';\nimport Animated, { Easing } from 'react-native-reanimated';\nimport invariant from 'invariant';\n+import {\n+ useNavigationBuilder,\n+ createNavigatorFactory,\n+ NavigationHelpersContext,\n+} from '@react-navigation/native';\nimport { values } from 'lib/utils/objects';\n@@ -25,46 +21,18 @@ import { scrollBlockingChatModals } from './route-names';\nconst { Value, timing, cond, call, lessOrEq, block } = Animated;\n/* eslint-enable import/no-named-as-default-member */\n-function createOverlayNavigator(\n- routeConfigMap: NavigationRouteConfigMap,\n- stackConfig: StackNavigatorConfig = {},\n-) {\n- const {\n+const OverlayNavigator = React.memo<Props>(({\ninitialRouteName,\n- initialRouteParams,\n- paths,\n- defaultNavigationOptions,\n- initialRouteKey,\n- } = stackConfig;\n- const stackRouterConfig = {\n+ children,\n+ screenOptions,\n+ ...rest\n+}) => {\n+ const { state, descriptors, navigation } = useNavigationBuilder(OverlayRouter, {\n+ children,\n+ screenOptions,\ninitialRouteName,\n- initialRouteParams,\n- paths,\n- defaultNavigationOptions,\n- initialRouteKey,\n- };\n- return createNavigator<\n- NavigationStackScreenOptions,\n- NavigationState,\n- StackNavigatorConfig,\n- NavigationStackProp<NavigationState>,\n- OverlayNavigatorProps,\n- >(\n- OverlayNavigator,\n- OverlayRouter(routeConfigMap, stackRouterConfig),\n- stackConfig,\n- );\n-}\n-\n-type OverlayNavigatorProps = {\n- navigation: NavigationStackProp<NavigationState>,\n- descriptors: { [key: string]: NavigationDescriptor },\n- navigationConfig: StackNavigatorConfig,\n-};\n-type Props = $ReadOnly<OverlayNavigatorProps>;\n-const OverlayNavigator = React.memo<Props>((props: Props) => {\n- const { navigation, descriptors } = props;\n- const curIndex = navigation.state.index;\n+ });\n+ const curIndex = state.index;\nconst positionRef = React.useRef();\nif (!positionRef.current) {\n@@ -72,7 +40,7 @@ const OverlayNavigator = React.memo<Props>((props: Props) => {\n}\nconst position = positionRef.current;\n- const { routes } = navigation.state;\n+ const { routes } = state;\nconst scenes = React.useMemo(\n() =>\nroutes.map((route, routeIndex) => {\n@@ -91,7 +59,7 @@ const OverlayNavigator = React.memo<Props>((props: Props) => {\n},\n};\n}),\n- [position, routes, descriptors, curIndex],\n+ [position, routes, curIndex],\n);\nconst prevScenesRef = React.useRef();\n@@ -105,7 +73,7 @@ const OverlayNavigator = React.memo<Props>((props: Props) => {\nconst getScrollBlockingModalStatus = data => {\nlet status = 'closed';\nfor (let scene of data) {\n- if (!scrollBlockingChatModals.includes(scene.route.routeName)) {\n+ if (!scrollBlockingChatModals.includes(scene.route.name)) {\ncontinue;\n}\nif (!scene.context.isDismissing) {\n@@ -186,7 +154,11 @@ const OverlayNavigator = React.memo<Props>((props: Props) => {\n}\nif (scene.descriptor !== data.descriptor) {\ndata = { ...data, descriptor: scene.descriptor };\n- dataChanged = true;\n+ // We don't set dataChanged here because descriptors get recomputed on\n+ // every render, which means we could get an infinite loop. However,\n+ // we want to update the descriptor whenever anything else changes, so\n+ // that if and when our scene is dismissed, the sceneData has the most\n+ // recent descriptor\n}\nif (\nscene.context.position !== data.context.position ||\n@@ -352,8 +324,7 @@ const OverlayNavigator = React.memo<Props>((props: Props) => {\npressableSceneAssigned = true;\n}\n- const { navigation: childNavigation, getComponent } = descriptor;\n- const SceneComponent = getComponent();\n+ const { render } = descriptor;\nconst pointerEvents = pressable ? 'auto' : 'none';\n// These listeners are used to clear routes after they finish dismissing\n@@ -362,16 +333,21 @@ const OverlayNavigator = React.memo<Props>((props: Props) => {\nscreens.unshift(\n<OverlayContext.Provider value={context} key={route.key}>\n<View style={styles.scene} pointerEvents={pointerEvents}>\n- <SceneComponent navigation={childNavigation} />\n+ {render()}\n</View>\n{listenerCode}\n</OverlayContext.Provider>,\n);\n}\n- return screens;\n+ return (\n+ <NavigationHelpersContext.Provider value={navigation}>\n+ {screens}\n+ </NavigationHelpersContext.Provider>\n+ );\n});\nOverlayNavigator.displayName = 'OverlayNavigator';\n+const createOverlayNavigator = createNavigatorFactory(OverlayNavigator);\nconst styles = StyleSheet.create({\nscene: {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Update OverlayNavigator custom navigator to React Nav 5 |
129,187 | 11.05.2020 23:26:31 | 14,400 | 497997cd25d63c7a03fd68c14448fb02864e4657 | [native] Enable Redux Dev Tools debugging for React Nav 5 | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/navigation-handler.react.js",
"new_path": "native/navigation/navigation-handler.react.js",
"diff": "@@ -16,6 +16,8 @@ import NavFromReduxHandler from './nav-from-redux-handler.react';\nimport { logInActionType, logOutActionType } from './action-types';\nimport DevTools from '../redux/dev-tools.react';\n+global.REACT_NAVIGATION_REDUX_DEVTOOLS_EXTENSION_INTEGRATION_ENABLED = true;\n+\nconst NavigationHandler = React.memo<{||}>(() => {\nconst navContext = React.useContext(NavContext);\nconst reduxRehydrated = useSelector(\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Enable Redux Dev Tools debugging for React Nav 5 |
129,187 | 11.05.2020 23:28:54 | 14,400 | 00d8cc5ca9a6a66d795b0545e242ce1953163e0f | [native] Don't dismiss ThreadPickerModal until Entry onFocus | [
{
"change_type": "MODIFY",
"old_path": "native/calendar/entry.react.js",
"new_path": "native/calendar/entry.react.js",
"diff": "@@ -59,6 +59,7 @@ import { ServerError } from 'lib/utils/errors';\nimport { entryKey } from 'lib/shared/entry-utils';\nimport { registerFetchKey } from 'lib/reducers/loading-reducer';\nimport { dateString } from 'lib/utils/date-utils';\n+import sleep from 'lib/utils/sleep';\nimport Button from '../components/button.react';\nimport {\n@@ -77,6 +78,7 @@ import {\nconnectNav,\ntype NavContextType,\n} from '../navigation/navigation-context';\n+import { waitForInteractions } from '../utils/interactions';\nfunction hueDistance(firstColor: string, secondColor: string): number {\nconst firstHue = tinycolor(firstColor).toHsv().h;\n@@ -84,6 +86,7 @@ function hueDistance(firstColor: string, secondColor: string): number {\nconst distance = Math.abs(firstHue - secondHue);\nreturn distance > 180 ? 360 - distance : distance;\n}\n+const omitEntryInfo = _omit(['entryInfo']);\ntype Props = {|\nnavigation: NavigationScreenProp<NavigationRoute>,\n@@ -167,7 +170,6 @@ class InternalEntry extends React.Component<Props, State> {\n}\nshouldComponentUpdate(nextProps: Props, nextState: State) {\n- const omitEntryInfo = _omit(['entryInfo']);\nreturn (\n!shallowequal(nextState, this.state) ||\n!shallowequal(omitEntryInfo(nextProps), omitEntryInfo(this.props)) ||\n@@ -359,6 +361,7 @@ class InternalEntry extends React.Component<Props, State> {\nvalue={this.state.text}\nonChangeText={this.onChangeText}\nmultiline={true}\n+ onFocus={this.onFocus}\nonBlur={this.onBlur}\nselectionColor={selectionColor}\nref={this.textInputRef}\n@@ -421,15 +424,15 @@ class InternalEntry extends React.Component<Props, State> {\n}\n};\n- enterEditMode = () => {\n+ enterEditMode = async () => {\nthis.setActive();\nthis.props.onEnterEditMode(this.props.entryInfo);\n- if (Platform.OS !== 'android') {\n- this.focus();\n- } else {\n+ if (Platform.OS === 'android') {\n// For some reason if we don't do this the scroll stops halfway through\n- InteractionManager.runAfterInteractions(() => setTimeout(this.focus));\n+ await waitForInteractions();\n+ await sleep(15);\n}\n+ this.focus();\n};\nfocus = () => {\n@@ -438,6 +441,9 @@ class InternalEntry extends React.Component<Props, State> {\nreturn;\n}\ntextInput.focus();\n+ };\n+\n+ onFocus = () => {\nif (this.props.threadPickerActive && this.props.foregroundKey) {\nthis.props.navigation.goBack(this.props.foregroundKey);\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Don't dismiss ThreadPickerModal until Entry onFocus |
129,187 | 11.05.2020 23:31:02 | 14,400 | f49ab42589462d519c4304f9c3014a8d5f04e1b3 | [native] Update SafeAreaView for React Nav 5
Can't import directly from React Nav anymore, using `react-native-safe-area-context` now | [
{
"change_type": "MODIFY",
"old_path": "native/components/safe-area-view.react.js",
"new_path": "native/components/safe-area-view.react.js",
"diff": "// @flow\n-import * as React from 'react';\n-import { SafeAreaView } from 'react-navigation';\n+import type { ViewStyle } from '../types/styles';\n-const forceInset = { top: 'always', bottom: 'never' };\n+import * as React from 'react';\n+import { View } from 'react-native';\n+import { useSafeArea } from 'react-native-safe-area-context';\ntype Props = {|\n- style?: $PropertyType<React.ElementConfig<typeof SafeAreaView>, 'style'>,\n+ style?: ViewStyle,\nchildren?: React.Node,\n|};\nfunction InsetSafeAreaView(props: Props) {\n- const { style, children } = props;\n+ const insets = useSafeArea();\n+ const style = [\n+ { paddingTop: insets.top },\n+ props.style,\n+ ];\nreturn (\n- <SafeAreaView forceInset={forceInset} style={style}>\n- {children}\n- </SafeAreaView>\n+ <View style={style}>\n+ {props.children}\n+ </View>\n);\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Update SafeAreaView for React Nav 5
Can't import directly from React Nav anymore, using `react-native-safe-area-context` now |
129,187 | 12.05.2020 10:02:11 | 14,400 | 46283902422d70edce7f6201652805ec0755cef1 | [native] Clean up display logic for CalendarInputBar | [
{
"change_type": "MODIFY",
"old_path": "native/calendar/calendar-input-bar.react.js",
"new_path": "native/calendar/calendar-input-bar.react.js",
"diff": "@@ -4,16 +4,10 @@ import type { AppState } from '../redux/redux-setup';\nimport * as React from 'react';\nimport { View, Text } from 'react-native';\n-import PropTypes from 'prop-types';\nimport { connect } from 'lib/utils/redux-utils';\nimport Button from '../components/button.react';\n-import {\n- addKeyboardShowListener,\n- addKeyboardDismissListener,\n- removeKeyboardListener,\n-} from '../keyboard/keyboard';\nimport { styleSelector } from '../themes/colors';\ntype Props = {|\n@@ -22,61 +16,18 @@ type Props = {|\n// Redux state\nstyles: typeof styles,\n|};\n-type State = {|\n- keyboardActive: boolean,\n-|};\n-class CalendarInputBar extends React.PureComponent<Props, State> {\n- static propTypes = {\n- onSave: PropTypes.func.isRequired,\n- disabled: PropTypes.bool.isRequired,\n- styles: PropTypes.objectOf(PropTypes.object).isRequired,\n- };\n- state = {\n- keyboardActive: false,\n- };\n- keyboardShowListener: ?Object;\n- keyboardDismissListener: ?Object;\n-\n- componentDidMount() {\n- this.keyboardShowListener = addKeyboardShowListener(this.keyboardShow);\n- this.keyboardDismissListener = addKeyboardDismissListener(\n- this.keyboardDismiss,\n- );\n- }\n-\n- componentWillUnmount() {\n- if (this.keyboardShowListener) {\n- removeKeyboardListener(this.keyboardShowListener);\n- this.keyboardShowListener = null;\n- }\n- if (this.keyboardDismissListener) {\n- removeKeyboardListener(this.keyboardDismissListener);\n- this.keyboardDismissListener = null;\n- }\n- }\n-\n- keyboardShow = () => {\n- this.setState({ keyboardActive: true });\n- };\n-\n- keyboardDismiss = () => {\n- this.setState({ keyboardActive: false });\n- };\n-\n- render() {\n- const inactiveStyle =\n- this.state.keyboardActive && !this.props.disabled\n- ? undefined\n- : this.props.styles.inactiveContainer;\n+function CalendarInputBar(props: Props) {\n+ const inactiveStyle = props.disabled\n+ ? props.styles.inactiveContainer\n+ : undefined;\nreturn (\n- <View style={[this.props.styles.container, inactiveStyle]}>\n- <Button onPress={this.props.onSave} iosActiveOpacity={0.5}>\n- <Text style={this.props.styles.saveButtonText}>Save</Text>\n+ <View style={[props.styles.container, inactiveStyle]}>\n+ <Button onPress={props.onSave} iosActiveOpacity={0.5}>\n+ <Text style={props.styles.saveButtonText}>Save</Text>\n</Button>\n</View>\n);\n}\n-}\nconst styles = {\ncontainer: {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/calendar/calendar.react.js",
"new_path": "native/calendar/calendar.react.js",
"diff": "@@ -139,7 +139,6 @@ type Props = {\n// Redux state\nlistData: ?$ReadOnlyArray<CalendarItem>,\ncalendarActive: boolean,\n- threadPickerOpen: boolean,\nstartDate: string,\nendDate: string,\ncalendarFilters: $ReadOnlyArray<CalendarFilter>,\n@@ -162,7 +161,6 @@ type State = {|\nlistDataWithHeights: ?$ReadOnlyArray<CalendarItemWithHeight>,\nreadyToShowList: boolean,\nextraData: ExtraData,\n- disableInputBar: boolean,\n|};\nclass Calendar extends React.PureComponent<Props, State> {\nstatic propTypes = {\n@@ -194,7 +192,6 @@ class Calendar extends React.PureComponent<Props, State> {\n]),\n),\ncalendarActive: PropTypes.bool.isRequired,\n- threadPickerOpen: PropTypes.bool.isRequired,\nstartDate: PropTypes.string.isRequired,\nendDate: PropTypes.string.isRequired,\ncalendarFilters: PropTypes.arrayOf(calendarFilterPropType).isRequired,\n@@ -243,9 +240,7 @@ class Calendar extends React.PureComponent<Props, State> {\nlastEntryKeyActive: ?string = null;\nkeyboardShowListener: ?{ +remove: () => void };\nkeyboardDismissListener: ?{ +remove: () => void };\n- keyboardDidDismissListener: ?{ +remove: () => void };\nkeyboardShownHeight: ?number = null;\n- keyboardPartiallyVisible = false;\n// If the query fails, we try it again\ntopLoadingFromScroll: ?CalendarQuery = null;\nbottomLoadingFromScroll: ?CalendarQuery = null;\n@@ -254,6 +249,7 @@ class Calendar extends React.PureComponent<Props, State> {\nbottomLoaderWaitingToLeaveView = true;\n// We keep refs to the entries so CalendarInputBar can save them\nentryRefs = new Map();\n+ currentlyEditing = new Set();\nconstructor(props: Props) {\nsuper(props);\n@@ -269,7 +265,6 @@ class Calendar extends React.PureComponent<Props, State> {\nlistDataWithHeights: null,\nreadyToShowList: false,\nextraData: this.latestExtraData,\n- disableInputBar: false,\n};\ncurrentCalendarRef = this;\n}\n@@ -294,9 +289,6 @@ class Calendar extends React.PureComponent<Props, State> {\nthis.keyboardDismissListener = addKeyboardDismissListener(\nthis.keyboardDismiss,\n);\n- this.keyboardDidDismissListener = addKeyboardDidDismissListener(\n- this.keyboardDidDismiss,\n- );\n}\ncomponentWillUnmount() {\n@@ -309,10 +301,6 @@ class Calendar extends React.PureComponent<Props, State> {\nremoveKeyboardListener(this.keyboardDismissListener);\nthis.keyboardDismissListener = null;\n}\n- if (this.keyboardDidDismissListener) {\n- removeKeyboardListener(this.keyboardDidDismissListener);\n- this.keyboardDidDismissListener = null;\n- }\n}\nhandleAppStateChange = (nextAppState: ?string) => {\n@@ -413,21 +401,6 @@ class Calendar extends React.PureComponent<Props, State> {\nthis.scrollToKey(lastEntryKeyActive, keyboardShownHeight);\nthis.lastEntryKeyActive = null;\n}\n-\n- if (\n- this.props.threadPickerOpen &&\n- !prevProps.threadPickerOpen &&\n- !this.state.disableInputBar\n- ) {\n- this.setState({ disableInputBar: true });\n- }\n- if (\n- !this.props.threadPickerOpen &&\n- prevProps.threadPickerOpen &&\n- !this.keyboardPartiallyVisible\n- ) {\n- this.setState({ disableInputBar: false });\n- }\n}\nhandleNewTextToMeasure() {\n@@ -667,6 +640,7 @@ class Calendar extends React.PureComponent<Props, State> {\nvisible={!!this.state.extraData.visibleEntries[key]}\nmakeActive={this.makeActive}\nonEnterEditMode={this.onEnterEntryEditMode}\n+ onConcludeEditMode={this.onConcludeEntryEditMode}\nonPressWhitespace={this.makeAllEntriesInactive}\nentryRef={this.entryRef}\n/>\n@@ -789,6 +763,7 @@ class Calendar extends React.PureComponent<Props, State> {\n<ContentLoading fillType=\"absolute\" colors={this.props.colors} />\n);\n}\n+ const disableInputBar = this.currentlyEditing.size === 0;\nreturn (\n<SafeAreaView style={this.props.styles.container}>\n<DisconnectedBar visible={this.props.calendarActive} />\n@@ -802,7 +777,7 @@ class Calendar extends React.PureComponent<Props, State> {\n{flatList}\n<CalendarInputBar\nonSave={this.onSaveEntry}\n- disabled={this.state.disableInputBar}\n+ disabled={disableInputBar}\n/>\n</KeyboardAvoidingView>\n</SafeAreaView>\n@@ -904,7 +879,12 @@ class Calendar extends React.PureComponent<Props, State> {\n} else {\nthis.lastEntryKeyActive = key;\n}\n- this.setState({ disableInputBar: false });\n+ this.currentlyEditing.add(key);\n+ };\n+\n+ onConcludeEntryEditMode = (entryInfo: EntryInfoWithHeight) => {\n+ const key = entryKey(entryInfo);\n+ this.currentlyEditing.delete(key);\n};\nkeyboardShow = (event: KeyboardEvent) => {\n@@ -916,20 +896,12 @@ class Calendar extends React.PureComponent<Props, State> {\nthis.scrollToKey(lastEntryKeyActive, keyboardShownHeight);\nthis.lastEntryKeyActive = null;\n}\n- this.keyboardPartiallyVisible = true;\n};\nkeyboardDismiss = () => {\nthis.keyboardShownHeight = null;\n};\n- keyboardDidDismiss = () => {\n- this.keyboardPartiallyVisible = false;\n- if (!this.props.threadPickerOpen) {\n- this.setState({ disableInputBar: false });\n- }\n- };\n-\nscrollToKey(lastEntryKeyActive: string, keyboardHeight: number) {\nconst data = this.state.listDataWithHeights;\ninvariant(data, 'should be set');\n@@ -1170,9 +1142,6 @@ const activeThreadPickerSelector = createIsForegroundSelector(\nexport default connectNav((context: ?NavContextType) => ({\ncalendarActive:\nactiveTabSelector(context) || activeThreadPickerSelector(context),\n- threadPickerOpen:\n- activeThreadPickerSelector(context) ||\n- !!(context && context.state.isTransitioning),\n}))(\nconnect(\n(state: AppState) => ({\n"
},
{
"change_type": "MODIFY",
"old_path": "native/calendar/entry.react.js",
"new_path": "native/calendar/entry.react.js",
"diff": "@@ -96,6 +96,7 @@ type Props = {|\nactive: boolean,\nmakeActive: (entryKey: string, active: boolean) => void,\nonEnterEditMode: (entryInfo: EntryInfoWithHeight) => void,\n+ onConcludeEditMode: (entryInfo: EntryInfoWithHeight) => void,\nonPressWhitespace: () => void,\nentryRef: (entryKey: string, entry: ?InternalEntry) => void,\n// Redux state\n@@ -130,6 +131,7 @@ class InternalEntry extends React.Component<Props, State> {\nactive: PropTypes.bool.isRequired,\nmakeActive: PropTypes.func.isRequired,\nonEnterEditMode: PropTypes.func.isRequired,\n+ onConcludeEditMode: PropTypes.func.isRequired,\nonPressWhitespace: PropTypes.func.isRequired,\nentryRef: PropTypes.func.isRequired,\ncalendarQuery: PropTypes.func.isRequired,\n@@ -473,6 +475,7 @@ class InternalEntry extends React.Component<Props, State> {\n}\nthis.guardedSetState({ editing: false });\nthis.props.makeActive(entryKey(this.props.entryInfo), false);\n+ this.props.onConcludeEditMode(this.props.entryInfo);\n};\nsave = () => {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Clean up display logic for CalendarInputBar |
129,187 | 13.05.2020 14:42:21 | 14,400 | 1f7f07940ef65b53d0691feaf30f672bda751cf0 | [native] Move Calendar center-on-tab-press behavior to event listener | [
{
"change_type": "MODIFY",
"old_path": "native/calendar/calendar.react.js",
"new_path": "native/calendar/calendar.react.js",
"diff": "@@ -124,15 +124,6 @@ type ExtraData = $ReadOnly<{|\nvisibleEntries: { [key: string]: boolean },\n|}>;\n-// This is v sad :(\n-// Overall, I have to say, this component is probably filled with more sadness\n-// than any other component in this project. This owes mostly to its complex\n-// infinite-scrolling behavior.\n-// But not this particular piece of sadness, actually. We have to cache the\n-// current Calendar ref here so we can access it from the statically defined\n-// navigationOptions.tabBarOnPress below.\n-let currentCalendarRef: ?Calendar = null;\n-\ntype Props = {\nnavigation: NavigationScreenProp<NavigationRoute>,\nroute: NavigationRoute,\n@@ -166,6 +157,9 @@ class Calendar extends React.PureComponent<Props, State> {\nstatic propTypes = {\nnavigation: PropTypes.shape({\nnavigate: PropTypes.func.isRequired,\n+ addListener: PropTypes.func.isRequired,\n+ removeListener: PropTypes.func.isRequired,\n+ isFocused: PropTypes.func.isRequired,\n}).isRequired,\nroute: PropTypes.shape({\nkey: PropTypes.string.isRequired,\n@@ -209,19 +203,6 @@ class Calendar extends React.PureComponent<Props, State> {\ntabBarIcon: ({ tintColor }) => (\n<Icon name=\"calendar\" style={[styles.icon, { color: tintColor }]} />\n),\n- tabBarOnPress: ({\n- navigation,\n- defaultHandler,\n- }: {\n- navigation: NavigationScreenProp<NavigationRoute>,\n- defaultHandler: () => void,\n- }) => {\n- if (!navigation.isFocused()) {\n- defaultHandler();\n- } else if (currentCalendarRef) {\n- currentCalendarRef.scrollToToday();\n- }\n- },\n};\nflatList: ?FlatList<CalendarItemWithHeight> = null;\ntextHeights: ?Map<string, number> = null;\n@@ -266,7 +247,6 @@ class Calendar extends React.PureComponent<Props, State> {\nreadyToShowList: false,\nextraData: this.latestExtraData,\n};\n- currentCalendarRef = this;\n}\nstatic textToMeasureFromListData(listData: $ReadOnlyArray<CalendarItem>) {\n@@ -289,6 +269,7 @@ class Calendar extends React.PureComponent<Props, State> {\nthis.keyboardDismissListener = addKeyboardDismissListener(\nthis.keyboardDismiss,\n);\n+ this.props.navigation.addListener('tabPress', this.onTabPress);\n}\ncomponentWillUnmount() {\n@@ -301,6 +282,7 @@ class Calendar extends React.PureComponent<Props, State> {\nremoveKeyboardListener(this.keyboardDismissListener);\nthis.keyboardDismissListener = null;\n}\n+ this.props.navigation.removeListener('tabPress', this.onTabPress);\n}\nhandleAppStateChange = (nextAppState: ?string) => {\n@@ -326,6 +308,12 @@ class Calendar extends React.PureComponent<Props, State> {\n}\n};\n+ onTabPress = () => {\n+ if (this.props.navigation.isFocused()) {\n+ this.scrollToToday();\n+ }\n+ };\n+\ncomponentDidUpdate(prevProps: Props, prevState: State) {\nif (this.props.listData !== prevProps.listData) {\nthis.handleNewTextToMeasure();\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Move Calendar center-on-tab-press behavior to event listener |
129,187 | 13.05.2020 14:50:32 | 14,400 | a055b16746a538fe15b146d3b775d7d76399aed9 | [native] Use setOptions to dynamically set save button in ComposeThread | [
{
"change_type": "MODIFY",
"old_path": "native/chat/compose-thread.react.js",
"new_path": "native/chat/compose-thread.react.js",
"diff": "@@ -74,30 +74,8 @@ type Route = {|\nparams: {|\nthreadType?: ThreadType,\nparentThreadInfo?: ThreadInfo,\n- createButtonDisabled?: boolean,\n|},\n|};\n-\n-let queuedPress = false;\n-function setQueuedPress() {\n- queuedPress = true;\n-}\n-let onPressCreateThread = setQueuedPress;\n-function setOnPressCreateThread(func: ?() => void) {\n- if (!func) {\n- onPressCreateThread = setQueuedPress;\n- return;\n- }\n- onPressCreateThread = func;\n- if (queuedPress) {\n- onPressCreateThread();\n- queuedPress = false;\n- }\n-}\n-function pressCreateThread() {\n- onPressCreateThread();\n-}\n-\ntype NavProp = ChatNavProp<Route>;\ntype Props = {|\n@@ -128,9 +106,8 @@ class ComposeThread extends React.PureComponent<Props, State> {\nstatic propTypes = {\nnavigation: PropTypes.shape({\nsetParams: PropTypes.func.isRequired,\n- goBack: PropTypes.func.isRequired,\n+ setOptions: PropTypes.func.isRequired,\nnavigate: PropTypes.func.isRequired,\n- getParam: PropTypes.func.isRequired,\npushNewThread: PropTypes.func.isRequired,\n}).isRequired,\nroute: PropTypes.shape({\n@@ -153,17 +130,10 @@ class ComposeThread extends React.PureComponent<Props, State> {\nnewThread: PropTypes.func.isRequired,\nsearchUsers: PropTypes.func.isRequired,\n};\n- static navigationOptions = ({ navigation }) => ({\n+ static navigationOptions = {\ntitle: 'Compose thread',\n- headerRight: (\n- <LinkButton\n- text=\"Create\"\n- onPress={pressCreateThread}\n- disabled={!!navigation.getParam('createButtonDisabled')}\n- />\n- ),\nheaderBackTitle: 'Back',\n- });\n+ };\nstate = {\nusernameInputText: '',\nuserInfoInputArray: [],\n@@ -171,13 +141,25 @@ class ComposeThread extends React.PureComponent<Props, State> {\ntagInput: ?TagInput<AccountUserInfo>;\ncreateThreadPressed = false;\n- componentDidMount() {\n- setOnPressCreateThread(this.onPressCreateThread);\n- this.searchUsers('');\n+ constructor(props: Props) {\n+ super(props);\n+ this.setLinkButton(true);\n+ }\n+\n+ setLinkButton(enabled: boolean) {\n+ this.props.navigation.setOptions({\n+ headerRight: () => (\n+ <LinkButton\n+ text=\"Create\"\n+ onPress={this.onPressCreateThread}\n+ disabled={enabled}\n+ />\n+ ),\n+ });\n}\n- componentWillUnmount() {\n- setOnPressCreateThread(null);\n+ componentDidMount() {\n+ this.searchUsers('');\n}\ncomponentDidUpdate(prevProps: Props) {\n@@ -406,7 +388,7 @@ class ComposeThread extends React.PureComponent<Props, State> {\n};\nasync newChatThreadAction() {\n- this.props.navigation.setParams({ createButtonDisabled: true });\n+ this.setLinkButton(false);\ntry {\nconst threadTypeParam = this.props.route.params.threadType;\nconst threadType = threadTypeParam\n@@ -424,7 +406,7 @@ class ComposeThread extends React.PureComponent<Props, State> {\n});\n} catch (e) {\nthis.createThreadPressed = false;\n- this.props.navigation.setParams({ createButtonDisabled: false });\n+ this.setLinkButton(true);\nAlert.alert(\n'Unknown error',\n'Uhh... try again?',\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Use setOptions to dynamically set save button in ComposeThread |
129,187 | 13.05.2020 14:55:27 | 14,400 | 2c2a77524f12b392985bc21e7806319ce33c6695 | [native] Use setOptions to dynamically set gestureEnabled | [
{
"change_type": "MODIFY",
"old_path": "native/chat/message-list-container.react.js",
"new_path": "native/chat/message-list-container.react.js",
"diff": "@@ -104,7 +104,6 @@ class MessageListContainer extends React.PureComponent<Props, State> {\n/>\n) : null,\nheaderBackTitle: 'Back',\n- gesturesEnabled: !navigation.state.params.gesturesDisabled,\n});\nconstructor(props: Props) {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/message-list-types.js",
"new_path": "native/chat/message-list-types.js",
"diff": "@@ -12,7 +12,6 @@ export type MessageListRoute = {|\n...NavigationLeafRoute,\nparams: {|\nthreadInfo: ThreadInfo,\n- gesturesDisabled?: boolean,\n|},\n|};\n@@ -22,7 +21,6 @@ export const messageListRoutePropType = PropTypes.shape({\nkey: PropTypes.string.isRequired,\nparams: PropTypes.shape({\nthreadInfo: threadInfoPropType.isRequired,\n- gesturesDisabled: PropTypes.bool,\n}).isRequired,\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/message-list.react.js",
"new_path": "native/chat/message-list.react.js",
"diff": "@@ -197,9 +197,9 @@ class MessageList extends React.PureComponent<Props, State> {\nconst scrollIsDisabled = MessageList.scrollDisabled(this.props);\nconst scrollWasDisabled = MessageList.scrollDisabled(prevProps);\nif (!scrollWasDisabled && scrollIsDisabled) {\n- this.props.navigation.setParams({ gesturesDisabled: true });\n+ this.props.navigation.setOptions({ gestureEnabled: false });\n} else if (scrollWasDisabled && !scrollIsDisabled) {\n- this.props.navigation.setParams({ gesturesDisabled: false });\n+ this.props.navigation.setOptions({ gestureEnabled: true });\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/settings/thread-settings.react.js",
"new_path": "native/chat/settings/thread-settings.react.js",
"diff": "@@ -85,7 +85,6 @@ type Route = {|\n...NavigationLeafRoute,\nparams: {|\nthreadInfo: ThreadInfo,\n- gesturesDisabled?: boolean,\n|},\n|};\ntype NavProp = NavigationScreenProp<Route>;\n@@ -234,7 +233,6 @@ class ThreadSettings extends React.PureComponent<Props, State> {\nstatic navigationOptions = ({ navigation }) => ({\ntitle: navigation.state.params.threadInfo.uiName,\nheaderBackTitle: 'Back',\n- gesturesEnabled: !navigation.state.params.gesturesDisabled,\n});\nflatListContainer: ?View;\n@@ -307,9 +305,9 @@ class ThreadSettings extends React.PureComponent<Props, State> {\nconst scrollIsDisabled = ThreadSettings.scrollDisabled(this.props);\nconst scrollWasDisabled = ThreadSettings.scrollDisabled(prevProps);\nif (!scrollWasDisabled && scrollIsDisabled) {\n- this.props.navigation.setParams({ gesturesDisabled: true });\n+ this.props.navigation.setOptions({ gestureEnabled: false });\n} else if (scrollWasDisabled && !scrollIsDisabled) {\n- this.props.navigation.setParams({ gesturesDisabled: false });\n+ this.props.navigation.setOptions({ gestureEnabled: true });\n}\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Use setOptions to dynamically set gestureEnabled |
129,187 | 13.05.2020 14:57:49 | 14,400 | 48709e38201b7cda866a5b3deb0507c321f4c879 | [native] Get rid of static navigationOptions in screens | [
{
"change_type": "MODIFY",
"old_path": "native/account/logged-out-modal.react.js",
"new_path": "native/account/logged-out-modal.react.js",
"diff": "@@ -116,10 +116,6 @@ class LoggedOutModal extends React.PureComponent<Props, State> {\ndispatchActionPayload: PropTypes.func.isRequired,\n};\n- static navigationOptions = {\n- gesturesEnabled: false,\n- };\n-\nkeyboardShowListener: ?EmitterSubscription;\nkeyboardHideListener: ?EmitterSubscription;\nexpectingKeyboardToAppear = false;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/calendar/calendar.react.js",
"new_path": "native/calendar/calendar.react.js",
"diff": "@@ -43,7 +43,6 @@ import {\nLayoutAnimation,\nTouchableWithoutFeedback,\n} from 'react-native';\n-import Icon from 'react-native-vector-icons/FontAwesome';\nimport PropTypes from 'prop-types';\nimport invariant from 'invariant';\nimport _findIndex from 'lodash/fp/findIndex';\n@@ -198,12 +197,6 @@ class Calendar extends React.PureComponent<Props, State> {\ndispatchActionPromise: PropTypes.func.isRequired,\nupdateCalendarQuery: PropTypes.func.isRequired,\n};\n- static navigationOptions = {\n- tabBarLabel: 'Calendar',\n- tabBarIcon: ({ tintColor }) => (\n- <Icon name=\"calendar\" style={[styles.icon, { color: tintColor }]} />\n- ),\n- };\nflatList: ?FlatList<CalendarItemWithHeight> = null;\ntextHeights: ?Map<string, number> = null;\ncurrentState: ?string = NativeAppState.currentState;\n@@ -1099,9 +1092,6 @@ const styles = {\nbackgroundColor: 'listSeparator',\nflex: 1,\n},\n- icon: {\n- fontSize: 28,\n- },\nkeyboardAvoidingView: {\nflex: 1,\n},\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/chat-thread-list.react.js",
"new_path": "native/chat/chat-thread-list.react.js",
"diff": "@@ -23,7 +23,6 @@ import {\n} from 'lib/selectors/chat-selectors';\nimport ChatThreadListItem from './chat-thread-list-item.react';\n-import ComposeThreadButton from './compose-thread-button.react';\nimport { registerChatScreen } from './chat-screen-registry';\nimport {\nComposeThreadRouteName,\n@@ -71,14 +70,6 @@ class ChatThreadList extends React.PureComponent<Props, State> {\nthreadSearchIndex: PropTypes.instanceOf(SearchIndex).isRequired,\nstyles: PropTypes.objectOf(PropTypes.object).isRequired,\n};\n- static navigationOptions = ({ navigation }) => ({\n- title: 'Threads',\n- headerRight:\n- Platform.OS === 'ios' ? (\n- <ComposeThreadButton navigate={navigation.navigate} />\n- ) : null,\n- headerBackTitle: 'Back',\n- });\nstate = {\nsearchText: '',\nsearchResults: new Set(),\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/compose-thread.react.js",
"new_path": "native/chat/compose-thread.react.js",
"diff": "@@ -130,10 +130,6 @@ class ComposeThread extends React.PureComponent<Props, State> {\nnewThread: PropTypes.func.isRequired,\nsearchUsers: PropTypes.func.isRequired,\n};\n- static navigationOptions = {\n- title: 'Compose thread',\n- headerBackTitle: 'Back',\n- };\nstate = {\nusernameInputText: '',\nuserInfoInputArray: [],\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/message-list-container.react.js",
"new_path": "native/chat/message-list-container.react.js",
"diff": "@@ -33,8 +33,6 @@ import {\nimport { onlyEmojiRegex } from 'lib/shared/emojis';\nimport MessageList from './message-list.react';\n-import MessageListHeaderTitle from './message-list-header-title.react';\n-import ThreadSettingsButton from './thread-settings-button.react';\nimport { registerChatScreen } from './chat-screen-registry';\nimport TextHeightMeasurer from '../text-height-measurer.react';\nimport ChatInputBar from './chat-input-bar.react';\n@@ -89,22 +87,6 @@ class MessageListContainer extends React.PureComponent<Props, State> {\nstyles: PropTypes.objectOf(PropTypes.object).isRequired,\ninputState: inputStatePropType,\n};\n- static navigationOptions = ({ navigation }) => ({\n- headerTitle: (\n- <MessageListHeaderTitle\n- threadInfo={navigation.state.params.threadInfo}\n- navigate={navigation.navigate}\n- />\n- ),\n- headerRight:\n- Platform.OS === 'android' ? (\n- <ThreadSettingsButton\n- threadInfo={navigation.state.params.threadInfo}\n- navigate={navigation.navigate}\n- />\n- ) : null,\n- headerBackTitle: 'Back',\n- });\nconstructor(props: Props) {\nsuper(props);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/settings/delete-thread.react.js",
"new_path": "native/chat/settings/delete-thread.react.js",
"diff": "@@ -104,10 +104,6 @@ class DeleteThread extends React.PureComponent<Props, State> {\ndeleteThread: PropTypes.func.isRequired,\nnavContext: navContextPropType,\n};\n- static navigationOptions = {\n- headerTitle: 'Delete thread',\n- headerBackTitle: 'Back',\n- };\nstate = {\npassword: '',\nonePasswordSupported: false,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/settings/thread-settings.react.js",
"new_path": "native/chat/settings/thread-settings.react.js",
"diff": "@@ -230,10 +230,6 @@ class ThreadSettings extends React.PureComponent<Props, State> {\nstyles: PropTypes.objectOf(PropTypes.object).isRequired,\noverlayContext: overlayContextPropType,\n};\n- static navigationOptions = ({ navigation }) => ({\n- title: navigation.state.params.threadInfo.uiName,\n- headerBackTitle: 'Back',\n- });\nflatListContainer: ?View;\nconstructor(props: Props) {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/more/appearance-preferences.react.js",
"new_path": "native/more/appearance-preferences.react.js",
"diff": "@@ -59,9 +59,6 @@ class AppearancePreferences extends React.PureComponent<Props> {\ncolors: colorsPropType.isRequired,\ndispatchActionPayload: PropTypes.func.isRequired,\n};\n- static navigationOptions = {\n- headerTitle: 'Appearance',\n- };\nrender() {\nconst { panelIosHighlightUnderlay: underlay } = this.props.colors;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/more/build-info.react.js",
"new_path": "native/more/build-info.react.js",
"diff": "@@ -16,9 +16,6 @@ type Props = {|\nstyles: typeof styles,\n|};\nclass BuildInfo extends React.PureComponent<Props> {\n- static navigationOptions = {\n- headerTitle: 'Build info',\n- };\nstatic propTypes = {\nstyles: PropTypes.objectOf(PropTypes.object).isRequired,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "native/more/delete-account.react.js",
"new_path": "native/more/delete-account.react.js",
"diff": "@@ -78,9 +78,6 @@ class DeleteAccount extends React.PureComponent<Props, State> {\ndispatchActionPromise: PropTypes.func.isRequired,\ndeleteAccount: PropTypes.func.isRequired,\n};\n- static navigationOptions = {\n- headerTitle: 'Delete account',\n- };\nmounted = false;\npasswordInput: ?TextInput;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/more/dev-tools.react.js",
"new_path": "native/more/dev-tools.react.js",
"diff": "@@ -57,9 +57,6 @@ class DevTools extends React.PureComponent<Props> {\nstyles: PropTypes.objectOf(PropTypes.object).isRequired,\ndispatchActionPayload: PropTypes.func.isRequired,\n};\n- static navigationOptions = {\n- headerTitle: 'Developer tools',\n- };\nrender() {\nconst { panelIosHighlightUnderlay: underlay } = this.props.colors;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/more/edit-email.react.js",
"new_path": "native/more/edit-email.react.js",
"diff": "@@ -73,9 +73,6 @@ class EditEmail extends React.PureComponent<Props, State> {\ndispatchActionPromise: PropTypes.func.isRequired,\nchangeUserSettings: PropTypes.func.isRequired,\n};\n- static navigationOptions = {\n- headerTitle: 'Change email',\n- };\nmounted = false;\npasswordInput: ?TextInput;\nemailInput: ?TextInput;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/more/edit-password.react.js",
"new_path": "native/more/edit-password.react.js",
"diff": "@@ -72,9 +72,6 @@ class EditPassword extends React.PureComponent<Props, State> {\ndispatchActionPromise: PropTypes.func.isRequired,\nchangeUserSettings: PropTypes.func.isRequired,\n};\n- static navigationOptions = {\n- headerTitle: 'Change password',\n- };\nmounted = false;\ncurrentPasswordInput: ?TextInput;\nnewPasswordInput: ?TextInput;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/more/more-screen.react.js",
"new_path": "native/more/more-screen.react.js",
"diff": "@@ -88,9 +88,6 @@ class MoreScreen extends React.PureComponent<Props> {\nlogOut: PropTypes.func.isRequired,\nresendVerificationEmail: PropTypes.func.isRequired,\n};\n- static navigationOptions = {\n- headerTitle: 'More',\n- };\nget username() {\nreturn this.props.currentUserInfo && !this.props.currentUserInfo.anonymous\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Get rid of static navigationOptions in screens |
129,187 | 13.05.2020 15:01:00 | 14,400 | a96b2a81e86b1b8c230f11eece8cd7c147a0716e | [native] Update MessageListHeaderTitle to work with React Nav 5 | [
{
"change_type": "MODIFY",
"old_path": "native/chat/message-list-header-title.react.js",
"new_path": "native/chat/message-list-header-title.react.js",
"diff": "@@ -9,7 +9,7 @@ import * as React from 'react';\nimport { View, Platform } from 'react-native';\nimport PropTypes from 'prop-types';\nimport Icon from 'react-native-vector-icons/Ionicons';\n-import { HeaderTitle } from 'react-navigation-stack';\n+import { HeaderTitle } from '@react-navigation/stack';\nimport { connect } from 'lib/utils/redux-utils';\n@@ -52,7 +52,6 @@ class MessageListHeaderTitle extends React.PureComponent<Props> {\n<Button\nonPress={this.onPress}\nstyle={this.props.styles.button}\n- topStyle={this.props.styles.button}\nandroidBorderlessRipple={true}\n>\n<View style={this.props.styles.container}>\n@@ -76,11 +75,7 @@ class MessageListHeaderTitle extends React.PureComponent<Props> {\nconst styles = {\nbutton: {\n- bottom: 0,\n- left: 0,\n- position: 'absolute',\n- right: 0,\n- top: 0,\n+ flex: 1,\n},\ncontainer: {\nflex: 1,\n@@ -89,11 +84,15 @@ const styles = {\njustifyContent: Platform.OS === 'android' ? 'flex-start' : 'center',\n},\nfakeIcon: {\n+ paddingRight: 7,\n+ paddingTop: 3,\nflex: 1,\nminWidth: 25,\nopacity: 0,\n},\nforwardIcon: {\n+ paddingLeft: 7,\n+ paddingTop: 3,\ncolor: 'link',\nflex: 1,\nminWidth: 25,\n@@ -102,7 +101,5 @@ const styles = {\nconst stylesSelector = styleSelector(styles);\nexport default connect((state: AppState) => ({\n- urlPrefix: state.urlPrefix,\n- customServer: state.customServer,\nstyles: stylesSelector(state),\n}))(MessageListHeaderTitle);\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Update MessageListHeaderTitle to work with React Nav 5 |
129,187 | 13.05.2020 15:07:32 | 14,400 | f652bd26333a4886dc812f3b49ba37b5eae7283b | [native] Themes for React Nav 5 | [
{
"change_type": "MODIFY",
"old_path": "native/themes/colors.js",
"new_path": "native/themes/colors.js",
"diff": "@@ -63,6 +63,7 @@ const light = Object.freeze({\nlistSearchBackground: '#DDDDDD',\nlistSearchIcon: '#AAAAAA',\nlistChatBubble: '#DDDDDDBB',\n+ navigationCard: '#FFFFFF',\n});\nexport type Colors = $Exact<typeof light>;\n@@ -121,6 +122,7 @@ const dark: Colors = Object.freeze({\nlistSearchBackground: '#555555',\nlistSearchIcon: '#AAAAAA',\nlistChatBubble: '#444444DD',\n+ navigationCard: '#2A2A2A',\n});\nconst colors = { light, dark };\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "native/themes/navigation.js",
"diff": "+// @flow\n+\n+import {\n+ DefaultTheme,\n+ DarkTheme as DefaultDarkTheme,\n+} from '@react-navigation/native';\n+\n+import { colors } from './colors';\n+\n+const DarkTheme = {\n+ ...DefaultDarkTheme,\n+ colors: {\n+ ...DefaultDarkTheme.colors,\n+ card: colors.dark.navigationCard,\n+ },\n+};\n+const LightTheme = {\n+ ...DefaultTheme,\n+ colors: {\n+ ...DefaultTheme.colors,\n+ card: colors.light.navigationCard,\n+ },\n+};\n+\n+export { DarkTheme, LightTheme };\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Themes for React Nav 5 |
129,187 | 13.05.2020 15:48:11 | 14,400 | b180b3eb309de4a6ce70d081f3f1da1903a0694d | [native] Get rid of chat-screen-registry.js | [
{
"change_type": "DELETE",
"old_path": "native/chat/chat-screen-registry.js",
"new_path": null,
"diff": "-// @flow\n-\n-import React from 'react';\n-\n-// In order for Chat's navigationOptions.tabBarOnPress callback to have access\n-// to the components that it needs to call, we have to register those components\n-// (by key) in some state somewhere. This is an ugly hack.\n-\n-const chatSceenRegistry: { [key: string]: ?ChatScreen } = {};\n-\n-export type ChatScreen = React.Component<*, *> & { +canReset: boolean };\n-\n-function registerChatScreen(key: string, screen: ?ChatScreen) {\n- chatSceenRegistry[key] = screen;\n-}\n-\n-function getChatScreen(key: string): ?ChatScreen {\n- return chatSceenRegistry[key];\n-}\n-\n-export { registerChatScreen, getChatScreen };\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/chat-thread-list.react.js",
"new_path": "native/chat/chat-thread-list.react.js",
"diff": "@@ -23,7 +23,6 @@ import {\n} from 'lib/selectors/chat-selectors';\nimport ChatThreadListItem from './chat-thread-list-item.react';\n-import { registerChatScreen } from './chat-screen-registry';\nimport {\nComposeThreadRouteName,\nMessageListRouteName,\n@@ -44,7 +43,6 @@ type Item = ChatThreadItem | {| type: 'search', searchText: string |};\ntype Props = {|\nnavigation: NavigationScreenProp<NavigationRoute>,\n- route: NavigationRoute,\n// Redux state\nchatListData: $ReadOnlyArray<ChatThreadItem>,\nviewerID: ?string,\n@@ -60,10 +58,6 @@ class ChatThreadList extends React.PureComponent<Props, State> {\nstatic propTypes = {\nnavigation: PropTypes.shape({\nnavigate: PropTypes.func.isRequired,\n- clearScreens: PropTypes.func.isRequired,\n- }).isRequired,\n- route: PropTypes.shape({\n- key: PropTypes.string.isRequired,\n}).isRequired,\nchatListData: PropTypes.arrayOf(chatThreadItemPropType).isRequired,\nviewerID: PropTypes.string,\n@@ -77,23 +71,6 @@ class ChatThreadList extends React.PureComponent<Props, State> {\nsearchInput: ?TextInput;\nflatList: ?FlatList<Item>;\n- componentDidMount() {\n- const { route } = this.props;\n- registerChatScreen(route.key, this);\n- }\n-\n- componentWillUnmount() {\n- const { route } = this.props;\n- registerChatScreen(route.key, null);\n- }\n-\n- get canReset() {\n- if (this.flatList) {\n- this.flatList.scrollToOffset({ offset: 0, animated: true });\n- }\n- return false;\n- }\n-\nrenderItem = (row: { item: Item }) => {\nconst item = row.item;\nif (item.type === 'search') {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/message-list-container.react.js",
"new_path": "native/chat/message-list-container.react.js",
"diff": "@@ -33,7 +33,6 @@ import {\nimport { onlyEmojiRegex } from 'lib/shared/emojis';\nimport MessageList from './message-list.react';\n-import { registerChatScreen } from './chat-screen-registry';\nimport TextHeightMeasurer from '../text-height-measurer.react';\nimport ChatInputBar from './chat-input-bar.react';\nimport { multimediaMessageContentSizes } from './multimedia-message.react';\n@@ -103,6 +102,22 @@ class MessageListContainer extends React.PureComponent<Props, State> {\n};\n}\n+ componentDidMount() {\n+ const tabNavigation = this.props.navigation.dangerouslyGetParent();\n+ tabNavigation.addListener('tabPress', this.onTabPress);\n+ }\n+\n+ componentWillUnmount() {\n+ const tabNavigation = this.props.navigation.dangerouslyGetParent();\n+ tabNavigation.removeListener('tabPress', this.onTabPress);\n+ }\n+\n+ onTabPress = () => {\n+ if (this.props.navigation.isFocused()) {\n+ this.props.navigation.popToTop();\n+ }\n+ };\n+\ntextToMeasureFromListData(listData: $ReadOnlyArray<ChatMessageItem>) {\nconst textToMeasure = [];\nfor (let item of listData) {\n@@ -137,18 +152,6 @@ class MessageListContainer extends React.PureComponent<Props, State> {\nreturn props.route.params.threadInfo;\n}\n- componentDidMount() {\n- registerChatScreen(this.props.route.key, this);\n- }\n-\n- componentWillUnmount() {\n- registerChatScreen(this.props.route.key, null);\n- }\n-\n- get canReset() {\n- return true;\n- }\n-\ncomponentDidUpdate(prevProps: Props) {\nconst oldReduxThreadInfo = prevProps.threadInfo;\nconst newReduxThreadInfo = this.props.threadInfo;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/message-list-types.js",
"new_path": "native/chat/message-list-types.js",
"diff": "@@ -27,4 +27,8 @@ export const messageListRoutePropType = PropTypes.shape({\nexport const messageListNavPropType = PropTypes.shape({\nnavigate: PropTypes.func.isRequired,\nsetParams: PropTypes.func.isRequired,\n+ setOptions: PropTypes.func.isRequired,\n+ dangerouslyGetParent: PropTypes.func.isRequired,\n+ isFocused: PropTypes.func.isRequired,\n+ popToTop: PropTypes.func.isRequired,\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/settings/thread-settings.react.js",
"new_path": "native/chat/settings/thread-settings.react.js",
"diff": "@@ -53,7 +53,6 @@ import {\nThreadSettingsAddChildThread,\n} from './thread-settings-list-action.react';\nimport ThreadSettingsChildThread from './thread-settings-child-thread.react';\n-import { registerChatScreen } from '../chat-screen-registry';\nimport ThreadSettingsName from './thread-settings-name.react';\nimport ThreadSettingsColor from './thread-settings-color.react';\nimport ThreadSettingsDescription from './thread-settings-description.react';\n@@ -65,14 +64,8 @@ import ThreadSettingsDeleteThread from './thread-settings-delete-thread.react';\nimport {\nAddUsersModalRouteName,\nComposeSubthreadModalRouteName,\n- ChatRouteName,\n} from '../../navigation/route-names';\n-import { createActiveTabSelector } from '../../navigation/nav-selectors';\nimport { styleSelector } from '../../themes/colors';\n-import {\n- connectNav,\n- type NavContextType,\n-} from '../../navigation/navigation-context';\nimport {\nwithOverlayContext,\ntype OverlayContextType,\n@@ -195,7 +188,6 @@ type Props = {|\nthreadMembers: RelativeMemberInfo[],\nchildThreadInfos: ?(ThreadInfo[]),\nsomethingIsSaving: boolean,\n- tabActive: boolean,\nstyles: typeof styles,\n// withOverlayContext\noverlayContext: ?OverlayContextType,\n@@ -215,6 +207,10 @@ class ThreadSettings extends React.PureComponent<Props, State> {\nnavigation: PropTypes.shape({\nnavigate: PropTypes.func.isRequired,\nsetParams: PropTypes.func.isRequired,\n+ setOptions: PropTypes.func.isRequired,\n+ dangerouslyGetParent: PropTypes.func.isRequired,\n+ isFocused: PropTypes.func.isRequired,\n+ popToTop: PropTypes.func.isRequired,\n}).isRequired,\nroute: PropTypes.shape({\nkey: PropTypes.string.isRequired,\n@@ -226,7 +222,6 @@ class ThreadSettings extends React.PureComponent<Props, State> {\nthreadMembers: PropTypes.arrayOf(relativeMemberInfoPropType).isRequired,\nchildThreadInfos: PropTypes.arrayOf(threadInfoPropType),\nsomethingIsSaving: PropTypes.bool.isRequired,\n- tabActive: PropTypes.bool.isRequired,\nstyles: PropTypes.objectOf(PropTypes.object).isRequired,\noverlayContext: overlayContextPropType,\n};\n@@ -259,20 +254,28 @@ class ThreadSettings extends React.PureComponent<Props, State> {\n}\ncomponentDidMount() {\n- registerChatScreen(this.props.route.key, this);\nconst threadInfo = ThreadSettings.getThreadInfo(this.props);\nif (!threadInChatList(threadInfo)) {\nthreadWatcher.watchID(threadInfo.id);\n}\n+ const tabNavigation = this.props.navigation.dangerouslyGetParent();\n+ tabNavigation.addListener('tabPress', this.onTabPress);\n}\ncomponentWillUnmount() {\n- registerChatScreen(this.props.route.key, null);\nconst threadInfo = ThreadSettings.getThreadInfo(this.props);\nif (!threadInChatList(threadInfo)) {\nthreadWatcher.removeID(threadInfo.id);\n}\n+ const tabNavigation = this.props.navigation.dangerouslyGetParent();\n+ tabNavigation.removeListener('tabPress', this.onTabPress);\n+ }\n+\n+ onTabPress = () => {\n+ if (this.props.navigation.isFocused() && !this.props.somethingIsSaving) {\n+ this.props.navigation.popToTop();\n}\n+ };\ncomponentDidUpdate(prevProps: Props) {\nconst oldReduxThreadInfo = prevProps.threadInfo;\n@@ -307,14 +310,10 @@ class ThreadSettings extends React.PureComponent<Props, State> {\n}\n}\n- get canReset() {\n- return this.props.tabActive && !this.props.somethingIsSaving;\n- }\n-\nrender() {\nconst threadInfo = ThreadSettings.getThreadInfo(this.props);\n- const canStartEditing = this.canReset;\n+ const canStartEditing = !this.props.somethingIsSaving;\nconst canEditThread = threadHasPermission(\nthreadInfo,\nthreadPermissions.EDIT_THREAD,\n@@ -828,7 +827,6 @@ const somethingIsSaving = (\nreturn false;\n};\n-const activeTabSelector = createActiveTabSelector(ChatRouteName);\nconst WrappedThreadSettings = connect(\n(state: AppState, ownProps: { route: Route }) => {\nconst threadID = ownProps.route.params.threadInfo.id;\n@@ -844,9 +842,7 @@ const WrappedThreadSettings = connect(\n};\n},\n)(\n- connectNav((context: ?NavContextType) => ({\n- tabActive: activeTabSelector(context),\n- }))(withOverlayContext(ThreadSettings)),\n+ withOverlayContext(ThreadSettings),\n);\nhoistNonReactStatics(WrappedThreadSettings, ThreadSettings);\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Get rid of chat-screen-registry.js |
129,187 | 13.05.2020 15:49:53 | 14,400 | 4a56ff16685b569384cdfd6c3ceef4663c9aebdb | [native] Move ChatThreadList scrollToTop-on-tab-press behavior to event listener | [
{
"change_type": "MODIFY",
"old_path": "native/chat/chat-thread-list.react.js",
"new_path": "native/chat/chat-thread-list.react.js",
"diff": "@@ -58,6 +58,8 @@ class ChatThreadList extends React.PureComponent<Props, State> {\nstatic propTypes = {\nnavigation: PropTypes.shape({\nnavigate: PropTypes.func.isRequired,\n+ dangerouslyGetParent: PropTypes.func.isRequired,\n+ isFocused: PropTypes.func.isRequired,\n}).isRequired,\nchatListData: PropTypes.arrayOf(chatThreadItemPropType).isRequired,\nviewerID: PropTypes.string,\n@@ -71,6 +73,22 @@ class ChatThreadList extends React.PureComponent<Props, State> {\nsearchInput: ?TextInput;\nflatList: ?FlatList<Item>;\n+ componentDidMount() {\n+ const tabNavigation = this.props.navigation.dangerouslyGetParent();\n+ tabNavigation.addListener('tabPress', this.onTabPress);\n+ }\n+\n+ componentWillUnmount() {\n+ const tabNavigation = this.props.navigation.dangerouslyGetParent();\n+ tabNavigation.removeListener('tabPress', this.onTabPress);\n+ }\n+\n+ onTabPress = () => {\n+ if (this.props.navigation.isFocused() && this.flatList) {\n+ this.flatList.scrollToOffset({ offset: 0, animated: true });\n+ }\n+ };\n+\nrenderItem = (row: { item: Item }) => {\nconst item = row.item;\nif (item.type === 'search') {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Move ChatThreadList scrollToTop-on-tab-press behavior to event listener |
129,187 | 13.05.2020 20:33:55 | 14,400 | 3ebb54f495cce3ea1b63255f28cb2f73ecabd26d | [native] RootNavigatorContext for setting keyboardHandlingEnabled | [
{
"change_type": "MODIFY",
"old_path": "native/calendar/thread-picker-modal.react.js",
"new_path": "native/calendar/thread-picker-modal.react.js",
"diff": "// @flow\n-import type { AppState } from '../redux/redux-setup';\n-import type { ThreadInfo } from 'lib/types/thread-types';\n-import { threadInfoPropType } from 'lib/types/thread-types';\n-import type { DispatchActionPayload } from 'lib/utils/action-utils';\nimport type {\nNavigationScreenProp,\nNavigationLeafRoute,\n} from 'react-navigation';\n-import React from 'react';\n-import PropTypes from 'prop-types';\n+import * as React from 'react';\nimport { StyleSheet } from 'react-native';\nimport invariant from 'invariant';\n+import { useSelector, useDispatch } from 'react-redux';\nimport { onScreenEntryEditableThreadInfos } from 'lib/selectors/thread-selectors';\nimport {\n@@ -20,76 +16,77 @@ import {\ncreateLocalEntryActionType,\n} from 'lib/actions/entry-actions';\nimport { threadSearchIndex } from 'lib/selectors/nav-selectors';\n-import SearchIndex from 'lib/shared/search-index';\n-import { connect } from 'lib/utils/redux-utils';\nimport Modal from '../components/modal.react';\nimport ThreadList from '../components/thread-list.react';\n+import { RootNavigatorContext } from '../navigation/root-navigator-context';\n+import { waitForInteractions } from '../utils/interactions';\n-type NavProp = NavigationScreenProp<{|\n+type Route = {|\n...NavigationLeafRoute,\nparams: {|\npresentedFrom: string,\ndateString: string,\n|},\n-|}>;\n+|};\n-type Props = {\n- navigation: NavProp,\n- route: {|\n- ...NavigationLeafRoute,\n- params: {|\n- presentedFrom: string,\n- dateString: string,\n- |},\n- |},\n- // Redux state\n- onScreenThreadInfos: $ReadOnlyArray<ThreadInfo>,\n- viewerID: ?string,\n- threadSearchIndex: SearchIndex,\n- nextLocalID: number,\n- // Redux dispatch functions\n- dispatchActionPayload: DispatchActionPayload,\n-};\n-class ThreadPickerModal extends React.PureComponent<Props> {\n- static propTypes = {\n- navigation: PropTypes.object.isRequired,\n- route: PropTypes.shape({\n- params: PropTypes.shape({\n- dateString: PropTypes.string.isRequired,\n- }).isRequired,\n- }).isRequired,\n- onScreenThreadInfos: PropTypes.arrayOf(threadInfoPropType).isRequired,\n- viewerID: PropTypes.string,\n- threadSearchIndex: PropTypes.instanceOf(SearchIndex).isRequired,\n- nextLocalID: PropTypes.number.isRequired,\n- dispatchActionPayload: PropTypes.func.isRequired,\n- };\n+type Props = {|\n+ navigation: NavigationScreenProp<Route>,\n+ route: Route,\n+|};\n+function ThreadPickerModal(props: Props) {\n+ const {\n+ navigation,\n+ route: { params: { dateString } },\n+ } = props;\n+\n+ const viewerID = useSelector(\n+ state => state.currentUserInfo && state.currentUserInfo.id,\n+ );\n+ const nextLocalID = useSelector(state => state.nextLocalID);\n+ const dispatch = useDispatch();\n+\n+ const rootNavigatorContext = React.useContext(RootNavigatorContext);\n+ const threadPicked = React.useCallback((threadID: string) => {\n+ invariant(\n+ dateString && viewerID && rootNavigatorContext,\n+ 'inputs to threadPicked should be set',\n+ );\n+ rootNavigatorContext.setKeyboardHandlingEnabled(false);\n+ dispatch({\n+ type: createLocalEntryActionType,\n+ payload: createLocalEntry(threadID, nextLocalID, dateString, viewerID),\n+ });\n+ }, [rootNavigatorContext, dispatch, viewerID, nextLocalID, dateString]);\n- render() {\n+ React.useEffect(\n+ () => navigation.addListener('blur', async () => {\n+ await waitForInteractions();\n+ invariant(\n+ rootNavigatorContext,\n+ 'RootNavigatorContext should be set in onScreenBlur',\n+ );\n+ rootNavigatorContext.setKeyboardHandlingEnabled(true);\n+ }),\n+ [navigation, rootNavigatorContext],\n+ );\n+\n+ const index = useSelector(state => threadSearchIndex(state));\n+ const onScreenThreadInfos = useSelector(\n+ state => onScreenEntryEditableThreadInfos(state),\n+ );\nreturn (\n- <Modal navigation={this.props.navigation}>\n+ <Modal navigation={navigation}>\n<ThreadList\n- threadInfos={this.props.onScreenThreadInfos}\n- onSelect={this.threadPicked}\n+ threadInfos={onScreenThreadInfos}\n+ onSelect={threadPicked}\nitemStyle={styles.threadListItem}\n- searchIndex={this.props.threadSearchIndex}\n+ searchIndex={index}\n/>\n</Modal>\n);\n}\n- threadPicked = (threadID: string) => {\n- const { viewerID, nextLocalID } = this.props;\n- const { dateString } = this.props.route.params;\n- invariant(dateString && viewerID, 'should be set');\n- this.props.dispatchActionPayload(\n- createLocalEntryActionType,\n- createLocalEntry(threadID, nextLocalID, dateString, viewerID),\n- );\n- };\n-}\n-\nconst styles = StyleSheet.create({\nthreadListItem: {\npaddingLeft: 10,\n@@ -98,13 +95,4 @@ const styles = StyleSheet.create({\n},\n});\n-export default connect(\n- (state: AppState) => ({\n- onScreenThreadInfos: onScreenEntryEditableThreadInfos(state),\n- viewerID: state.currentUserInfo && state.currentUserInfo.id,\n- threadSearchIndex: threadSearchIndex(state),\n- nextLocalID: state.nextLocalID,\n- }),\n- null,\n- true,\n-)(ThreadPickerModal);\n+export default ThreadPickerModal;\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "native/navigation/root-navigator-context.js",
"diff": "+// @flow\n+\n+import * as React from 'react';\n+\n+export type RootNavigatorContextType = {|\n+ setKeyboardHandlingEnabled: (enabled: boolean) => void,\n+|};\n+\n+const RootNavigatorContext =\n+ React.createContext<?RootNavigatorContextType>(null);\n+\n+export {\n+ RootNavigatorContext,\n+};\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] RootNavigatorContext for setting keyboardHandlingEnabled |
129,187 | 14.05.2020 15:29:48 | 14,400 | 60598d3f8c16c433ecb8ad8709df151b55c12a44 | [native] Update Header components for React Nav 5 | [
{
"change_type": "MODIFY",
"old_path": "native/chat/chat-header.react.js",
"new_path": "native/chat/chat-header.react.js",
"diff": "@@ -14,9 +14,6 @@ import {\nconst activeTabSelector = createActiveTabSelector(ChatRouteName);\n-const ChatHeader = connectNav((context: ?NavContextType) => ({\n+export default connectNav((context: ?NavContextType) => ({\nactiveTab: activeTabSelector(context),\n}))(Header);\n-\n-// eslint-disable-next-line react/display-name\n-export default (props: $Exact<HeaderProps>) => <ChatHeader {...props} />;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/more/more-header.react.js",
"new_path": "native/more/more-header.react.js",
"diff": "@@ -14,9 +14,6 @@ import {\nconst activeTabSelector = createActiveTabSelector(MoreRouteName);\n-const MoreHeader = connectNav((context: ?NavContextType) => ({\n+export default connectNav((context: ?NavContextType) => ({\nactiveTab: activeTabSelector(context),\n}))(Header);\n-\n-// eslint-disable-next-line react/display-name\n-export default (props: $Exact<HeaderProps>) => <MoreHeader {...props} />;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/header-back-button.react.js",
"new_path": "native/navigation/header-back-button.react.js",
"diff": "@@ -4,7 +4,9 @@ import type { AppState } from '../redux/redux-setup';\nimport type { Colors } from '../themes/colors';\nimport * as React from 'react';\n-import { HeaderBackButton as BaseHeaderBackButton } from 'react-navigation-stack';\n+import {\n+ HeaderBackButton as BaseHeaderBackButton,\n+} from '@react-navigation/stack';\nimport { connect } from 'lib/utils/redux-utils';\n@@ -16,7 +18,7 @@ type Props = {\ncolors: Colors,\n};\nfunction HeaderBackButton(props: Props) {\n- if (props.scene && props.scene.index === 0) {\n+ if (!props.canGoBack) {\nreturn null;\n}\nconst { colors, ...rest } = props;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/header.react.js",
"new_path": "native/navigation/header.react.js",
"diff": "// @flow\n-import type { HeaderProps } from 'react-navigation-stack';\n-\nimport * as React from 'react';\n-import { Header } from 'react-navigation-stack';\n+import { Header } from '@react-navigation/stack';\nimport { View } from 'react-native';\nimport DisconnectedBar from './disconnected-bar.react';\ntype Props = {|\nactiveTab: boolean,\n- ...$Exact<HeaderProps>,\n|};\nexport default function CustomHeader(props: Props) {\nconst { activeTab, ...rest } = props;\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Update Header components for React Nav 5 |
129,187 | 14.05.2020 15:30:19 | 14,400 | 1668177db9d4124b48ad23b67c30496b48856438 | [native] Get rid of unused props in More screens | [
{
"change_type": "MODIFY",
"old_path": "native/more/delete-account.react.js",
"new_path": "native/more/delete-account.react.js",
"diff": "import type { AppState } from '../redux/redux-setup';\nimport type { DispatchActionPromise } from 'lib/utils/action-utils';\n-import type { NavigationScreenProp } from 'react-navigation';\nimport type { LoadingStatus } from 'lib/types/loading-types';\nimport { loadingStatusPropType } from 'lib/types/loading-types';\nimport type { LogOutResult } from 'lib/types/account-types';\n@@ -44,7 +43,6 @@ import {\n} from '../themes/colors';\ntype Props = {|\n- navigation: NavigationScreenProp<*>,\n// Redux state\nloadingStatus: LoadingStatus,\nusername: ?string,\n@@ -66,9 +64,6 @@ type State = {|\n|};\nclass DeleteAccount extends React.PureComponent<Props, State> {\nstatic propTypes = {\n- navigation: PropTypes.shape({\n- navigate: PropTypes.func.isRequired,\n- }).isRequired,\nloadingStatus: loadingStatusPropType.isRequired,\nusername: PropTypes.string,\npreRequestUserState: preRequestUserStatePropType.isRequired,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/more/edit-email.react.js",
"new_path": "native/more/edit-email.react.js",
"diff": "@@ -62,7 +62,6 @@ type State = {|\nclass EditEmail extends React.PureComponent<Props, State> {\nstatic propTypes = {\nnavigation: PropTypes.shape({\n- navigate: PropTypes.func.isRequired,\ngoBack: PropTypes.func.isRequired,\n}).isRequired,\nemail: PropTypes.string,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/more/edit-password.react.js",
"new_path": "native/more/edit-password.react.js",
"diff": "@@ -62,7 +62,6 @@ type State = {|\nclass EditPassword extends React.PureComponent<Props, State> {\nstatic propTypes = {\nnavigation: PropTypes.shape({\n- navigate: PropTypes.func.isRequired,\ngoBack: PropTypes.func.isRequired,\n}).isRequired,\nloadingStatus: loadingStatusPropType.isRequired,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Get rid of unused props in More screens |
129,187 | 14.05.2020 15:34:05 | 14,400 | 52cf06fa56bd0f9fdffa4d54dfa940e4e0009347 | [native] Update code that looks at nav state to handle React Nav 5 changes | [
{
"change_type": "MODIFY",
"old_path": "native/chat/thread-screen-pruner.react.js",
"new_path": "native/chat/thread-screen-pruner.react.js",
"diff": "@@ -27,8 +27,8 @@ const ThreadScreenPruner = React.memo<{||}>(() => {\n}\nconst { state } = navContext;\nconst appRoute = assertNavigationRouteNotLeafNode(state.routes[0]);\n- const tabRoute = assertNavigationRouteNotLeafNode(appRoute.routes[0]);\n- return assertNavigationRouteNotLeafNode(tabRoute.routes[1]);\n+ const tabRoute = assertNavigationRouteNotLeafNode(appRoute.state.routes[0]);\n+ return assertNavigationRouteNotLeafNode(tabRoute.state.routes[1]);\n}, [navContext]);\nconst inStackThreadIDs = React.useMemo(() => {\n@@ -36,7 +36,7 @@ const ThreadScreenPruner = React.memo<{||}>(() => {\nif (!chatRoute) {\nreturn threadIDs;\n}\n- for (let route of chatRoute.routes) {\n+ for (let route of chatRoute.state.routes) {\nconst threadID = getThreadIDFromRoute(route);\nif (threadID) {\nthreadIDs.add(threadID);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/default-state.js",
"new_path": "native/navigation/default-state.js",
"diff": "@@ -19,38 +19,47 @@ import {\nexport type NavInfo = $Exact<BaseNavInfo>;\nconst defaultNavigationState: NavigationState = {\n+ type: 'stack',\nindex: 1,\nroutes: [\n{\n- key: 'App',\n- routeName: AppRouteName,\n+ name: AppRouteName,\n+ state: {\n+ type: 'stack',\nindex: 0,\nroutes: [\n{\n- key: 'TabNavigator',\n- routeName: TabNavigatorRouteName,\n+ name: TabNavigatorRouteName,\n+ state: {\n+ type: 'tab',\nindex: 1,\nroutes: [\n- { key: 'Calendar', routeName: CalendarRouteName },\n+ { name: CalendarRouteName },\n{\n- key: 'Chat',\n- routeName: ChatRouteName,\n+ name: ChatRouteName,\n+ state: {\n+ type: 'stack',\nindex: 0,\nroutes: [\n- { key: 'ChatThreadList', routeName: ChatThreadListRouteName },\n+ { name: ChatThreadListRouteName },\n],\n},\n+ },\n{\n- key: 'More',\n- routeName: MoreRouteName,\n+ name: MoreRouteName,\n+ state: {\n+ type: 'stack',\nindex: 0,\n- routes: [{ key: 'MoreScreen', routeName: MoreScreenRouteName }],\n+ routes: [{ name: MoreScreenRouteName }],\n+ },\n},\n],\n},\n+ },\n],\n},\n- { key: 'LoggedOutModal', routeName: LoggedOutModalRouteName },\n+ },\n+ { name: LoggedOutModalRouteName },\n],\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/modal-pruner.react.js",
"new_path": "native/navigation/modal-pruner.react.js",
"diff": "@@ -69,11 +69,11 @@ function collectDependencyInfo(\n}\n}\nconst routeName =\n- route.routeName && typeof route.routeName === 'string'\n- ? route.routeName\n+ route.name && typeof route.name === 'string'\n+ ? route.name\n: undefined;\n- if (route.routes) {\n- route.routes.forEach(child =>\n+ if (route.state && route.state.routes) {\n+ route.state.routes.forEach(child =>\ncollectDependencyInfo(child, dependencyMap, routeName),\n);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/nav-selectors.js",
"new_path": "native/navigation/nav-selectors.js",
"diff": "@@ -41,7 +41,7 @@ const baseCreateIsForegroundSelector = (routeName: string) =>\nreturn false;\n}\nreturn (\n- navigationState.routes[navigationState.index].routeName === routeName\n+ navigationState.routes[navigationState.index].name === routeName\n);\n},\n);\n@@ -58,7 +58,7 @@ function useIsAppLoggedIn() {\nreturn false;\n}\nconst { state } = navContext;\n- return !accountModals.includes(state.routes[state.index].routeName);\n+ return !accountModals.includes(state.routes[state.index].name);\n}, [navContext]);\n}\n@@ -78,16 +78,16 @@ const baseCreateActiveTabSelector = (routeName: string) =>\nreturn false;\n}\nconst currentRootSubroute = navigationState.routes[navigationState.index];\n- if (currentRootSubroute.routeName !== AppRouteName) {\n+ if (currentRootSubroute.name !== AppRouteName) {\nreturn false;\n}\nconst appRoute = assertNavigationRouteNotLeafNode(currentRootSubroute);\n- const [firstAppSubroute] = appRoute.routes;\n- if (firstAppSubroute.routeName !== TabNavigatorRouteName) {\n+ const [firstAppSubroute] = appRoute.state.routes;\n+ if (firstAppSubroute.name !== TabNavigatorRouteName) {\nreturn false;\n}\nconst tabRoute = assertNavigationRouteNotLeafNode(firstAppSubroute);\n- return tabRoute.routes[tabRoute.index].routeName === routeName;\n+ return tabRoute.state.routes[tabRoute.state.index].name === routeName;\n},\n);\nconst createActiveTabSelector: (\n@@ -105,13 +105,13 @@ const scrollBlockingChatModalsClosedSelector: (\nreturn false;\n}\nconst currentRootSubroute = navigationState.routes[navigationState.index];\n- if (currentRootSubroute.routeName !== AppRouteName) {\n+ if (currentRootSubroute.name !== AppRouteName) {\nreturn true;\n}\nconst appRoute = assertNavigationRouteNotLeafNode(currentRootSubroute);\n- for (let i = appRoute.index; i >= 0; i--) {\n- const route = appRoute.routes[i];\n- if (scrollBlockingChatModals.includes(route.routeName)) {\n+ for (let i = appRoute.state.index; i >= 0; i--) {\n+ const route = appRoute.state.routes[i];\n+ if (scrollBlockingChatModals.includes(route.name)) {\nreturn false;\n}\n}\n@@ -127,40 +127,24 @@ function selectBackgroundIsDark(\nreturn false;\n}\nconst currentRootSubroute = navigationState.routes[navigationState.index];\n- if (currentRootSubroute.routeName !== AppRouteName) {\n+ if (currentRootSubroute.name !== AppRouteName) {\n// Very bright... we'll call it non-dark. Doesn't matter right now since\n// we only use this selector for determining ActionResultModal appearance\nreturn false;\n}\nconst appRoute = assertNavigationRouteNotLeafNode(currentRootSubroute);\n- let currentAppSubroute = appRoute.routes[appRoute.index];\n- if (currentAppSubroute.routeName === ActionResultModalRouteName) {\n- currentAppSubroute = appRoute.routes[appRoute.index - 1];\n+ let appIndex = appRoute.state.index;\n+ let currentAppSubroute = appRoute.state.routes[appIndex];\n+ while (currentAppSubroute.name === ActionResultModalRouteName) {\n+ currentAppSubroute = appRoute.state.routes[--appIndex];\n}\n- if (scrollBlockingChatModals.includes(currentAppSubroute.routeName)) {\n+ if (scrollBlockingChatModals.includes(currentAppSubroute.name)) {\n// All the scroll-blocking chat modals have a dark background\nreturn true;\n}\nreturn theme === 'dark';\n}\n-const overlayModalClosingSelector: (\n- context: ?NavContextType,\n-) => boolean = createSelector(\n- (context: ?NavContextType) => context && context.state,\n- (navigationState: ?NavigationState) => {\n- if (!navigationState) {\n- return false;\n- }\n- const currentRootSubroute = navigationState.routes[navigationState.index];\n- if (currentRootSubroute.routeName !== AppRouteName) {\n- return false;\n- }\n- const appRoute = assertNavigationRouteNotLeafNode(currentRootSubroute);\n- return !!appRoute.isTransitioning;\n- },\n-);\n-\nfunction activeThread(\nnavigationState: ?NavigationState,\nvalidRouteNames: $ReadOnlyArray<string>,\n@@ -170,8 +154,8 @@ function activeThread(\n}\nlet rootIndex = navigationState.index;\nlet currentRootSubroute = navigationState.routes[rootIndex];\n- while (currentRootSubroute.routeName !== AppRouteName) {\n- if (!chatRootModals.includes(currentRootSubroute.routeName)) {\n+ while (currentRootSubroute.name !== AppRouteName) {\n+ if (!chatRootModals.includes(currentRootSubroute.name)) {\nreturn null;\n}\nif (rootIndex === 0) {\n@@ -180,17 +164,17 @@ function activeThread(\ncurrentRootSubroute = navigationState.routes[--rootIndex];\n}\nconst appRoute = assertNavigationRouteNotLeafNode(currentRootSubroute);\n- const [firstAppSubroute] = appRoute.routes;\n- if (firstAppSubroute.routeName !== TabNavigatorRouteName) {\n+ const [firstAppSubroute] = appRoute.state.routes;\n+ if (firstAppSubroute.name !== TabNavigatorRouteName) {\nreturn null;\n}\nconst tabRoute = assertNavigationRouteNotLeafNode(firstAppSubroute);\n- const currentTabSubroute = tabRoute.routes[tabRoute.index];\n- if (currentTabSubroute.routeName !== ChatRouteName) {\n+ const currentTabSubroute = tabRoute.state.routes[tabRoute.state.index];\n+ if (currentTabSubroute.name !== ChatRouteName) {\nreturn null;\n}\nconst chatRoute = assertNavigationRouteNotLeafNode(currentTabSubroute);\n- const currentChatSubroute = chatRoute.routes[chatRoute.index];\n+ const currentChatSubroute = chatRoute.state.routes[chatRoute.state.index];\nreturn getThreadIDFromRoute(currentChatSubroute, validRouteNames);\n}\n@@ -284,7 +268,6 @@ export {\ncreateActiveTabSelector,\nscrollBlockingChatModalsClosedSelector,\nselectBackgroundIsDark,\n- overlayModalClosingSelector,\nactiveThreadSelector,\nactiveMessageListSelector,\nuseActiveThread,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/utils/navigation-utils.js",
"new_path": "native/utils/navigation-utils.js",
"diff": "@@ -18,58 +18,7 @@ import {\nfunction assertNavigationRouteNotLeafNode(\nroute: NavigationRoute,\n): NavigationStateRoute {\n- // There's no way in Flow to type the exact shape of our navigationState,\n- // since arrays types can't be refined to tuples. We thus must rely on runtime\n- // assertions to satisfy Flow's typesystem.\n- invariant(\n- route.routes &&\n- Array.isArray(route.routes) &&\n- route.index !== null &&\n- route.index !== undefined &&\n- typeof route.index === 'number',\n- 'route should be a NavigationStateRoute',\n- );\n- const index = route.index;\n- const routes = [];\n- for (let subroute of route.routes) {\n- invariant(\n- subroute &&\n- typeof subroute === 'object' &&\n- typeof subroute.key === 'string' &&\n- typeof subroute.routeName === 'string',\n- 'subroute should be a NavigationRoute!',\n- );\n- let subrouteCopy: NavigationRoute = {\n- key: subroute.key,\n- routeName: subroute.routeName,\n- };\n- if (subroute.path) {\n- invariant(\n- typeof subroute.path === 'string',\n- \"navigation's path should be a string!\",\n- );\n- subrouteCopy.path = subroute.path;\n- }\n- if (subroute.params) {\n- invariant(\n- subroute.params && typeof subroute.params === 'object',\n- \"navigation's params should be an object!\",\n- );\n- subrouteCopy.params = subroute.params;\n- }\n- if (subroute.index !== null && subroute.index !== undefined) {\n- subrouteCopy = assertNavigationRouteNotLeafNode({\n- ...subroute,\n- ...subrouteCopy,\n- });\n- }\n- routes.push(subrouteCopy);\n- }\n- return {\n- ...route,\n- index,\n- routes,\n- };\n+ return route;\n}\nfunction getThreadIDFromParams(params: ?NavigationParams): string {\n@@ -105,10 +54,10 @@ function getThreadIDFromRoute(\nroute: NavigationRoute,\nroutes?: $ReadOnlyArray<string> = threadRoutes,\n) {\n- if (!routes.includes(route.routeName)) {\n+ if (!routes.includes(route.name)) {\nreturn null;\n}\n- if (route.routeName === ComposeThreadRouteName) {\n+ if (route.name === ComposeThreadRouteName) {\nreturn getParentThreadIDFromParams(route.params);\n}\nreturn getThreadIDFromParams(route.params);\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Update code that looks at nav state to handle React Nav 5 changes |
129,187 | 14.05.2020 15:35:15 | 14,400 | 05b806e727f636bc0cdc1b195e8f0e4177f2de9a | [native] Update Modal component for React Nav 5
`StackNavigator` can now handle the overlay, but we need to make sure we don't `goBack` unless we're focused | [
{
"change_type": "MODIFY",
"old_path": "native/components/modal.react.js",
"new_path": "native/components/modal.react.js",
"diff": "@@ -8,7 +8,12 @@ import type { AppState } from '../redux/redux-setup';\nimport type { ViewStyle } from '../types/styles';\nimport * as React from 'react';\n-import { View, TouchableWithoutFeedback, ViewPropTypes } from 'react-native';\n+import {\n+ View,\n+ TouchableWithoutFeedback,\n+ ViewPropTypes,\n+ StyleSheet,\n+} from 'react-native';\nimport PropTypes from 'prop-types';\nimport { connect } from 'lib/utils/redux-utils';\n@@ -27,6 +32,7 @@ class Modal extends React.PureComponent<Props> {\nstatic propTypes = {\nchildren: PropTypes.node,\nnavigation: PropTypes.shape({\n+ isFocused: PropTypes.func.isRequired,\ngoBack: PropTypes.func.isRequired,\n}).isRequired,\nstyles: PropTypes.objectOf(PropTypes.object).isRequired,\n@@ -35,7 +41,9 @@ class Modal extends React.PureComponent<Props> {\n};\nclose = () => {\n+ if (this.props.navigation.isFocused()) {\nthis.props.navigation.goBack();\n+ }\n};\nrender() {\n@@ -45,7 +53,7 @@ class Modal extends React.PureComponent<Props> {\nstyle={[this.props.styles.container, containerStyle]}\n>\n<TouchableWithoutFeedback onPress={this.close}>\n- <View style={this.props.styles.backdrop} />\n+ <View style={StyleSheet.absoluteFill} />\n</TouchableWithoutFeedback>\n<View style={[this.props.styles.modal, modalStyle]}>{children}</View>\n</KeyboardAvoidingView>\n@@ -54,16 +62,6 @@ class Modal extends React.PureComponent<Props> {\n}\nconst styles = {\n- backdrop: {\n- backgroundColor: 'black',\n- bottom: 0,\n- left: 0,\n- opacity: 0.7,\n- overflow: 'visible',\n- position: 'absolute',\n- right: 0,\n- top: -1000,\n- },\ncontainer: {\nflex: 1,\njustifyContent: 'center',\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Update Modal component for React Nav 5
`StackNavigator` can now handle the overlay, but we need to make sure we don't `goBack` unless we're focused |
129,187 | 14.05.2020 15:36:13 | 14,400 | a63e4c3e887d6c8ff005c05581102ad9831a97b3 | [native] Update navigation routers for React Nav 5 | [
{
"change_type": "MODIFY",
"old_path": "native/chat/chat-router.js",
"new_path": "native/chat/chat-router.js",
"diff": "import type { ThreadInfo } from 'lib/types/thread-types';\n-import {\n- StackRouter,\n- NavigationActions,\n- type NavigationAction,\n- type NavigationState,\n- type NavigationRoute,\n- type NavigationRouteConfigMap,\n- type NavigationStackRouterConfig,\n-} from 'react-navigation';\n+import { StackRouter, CommonActions } from '@react-navigation/native';\nimport {\nChatThreadListRouteName,\n@@ -28,60 +20,25 @@ import {\npushNewThreadActionType,\n} from '../navigation/action-types';\n-type ClearScreensAction = {|\n- +type: 'CLEAR_SCREENS',\n- +routeNames: $ReadOnlyArray<string>,\n- +preserveFocus?: boolean,\n-|};\n-type ReplaceWithThreadAction = {|\n- +type: 'REPLACE_WITH_THREAD',\n- +threadInfo: ThreadInfo,\n-|};\n-type ClearThreadsAction = {|\n- +type: 'CLEAR_THREADS',\n- +threadIDs: $ReadOnlyArray<string>,\n- +preserveFocus?: boolean,\n-|};\n-type PushNewThreadAction = {|\n- +type: 'PUSH_NEW_THREAD',\n- +threadInfo: ThreadInfo,\n-|};\n-export type ChatRouterNavigationAction =\n- | NavigationAction\n- | ClearScreensAction\n- | ReplaceWithThreadAction\n- | ClearThreadsAction\n- | PushNewThreadAction;\n-\n-const defaultConfig = Object.freeze({});\n-function ChatRouter(\n- routeConfigMap: NavigationRouteConfigMap,\n- stackConfig?: NavigationStackRouterConfig = defaultConfig,\n-) {\n- const stackRouter = StackRouter(routeConfigMap, stackConfig);\n+function ChatRouter(options) {\n+ const stackRouter = StackRouter(options);\nreturn {\n...stackRouter,\ngetStateForAction: (\n- action: ChatRouterNavigationAction,\n- lastState: ?NavigationState,\n+ lastState,\n+ action,\n+ options,\n) => {\nif (action.type === clearScreensActionType) {\nconst { routeNames } = action;\nif (!lastState) {\nreturn lastState;\n}\n- const newState = removeScreensFromStack(\n+ return removeScreensFromStack(\nlastState,\n(route: NavigationRoute) =>\n- routeNames.includes(route.routeName) ? 'remove' : 'keep',\n+ routeNames.includes(route.name) ? 'remove' : 'keep',\n);\n- const isTransitioning =\n- lastState.routes[lastState.index].key !==\n- newState.routes[newState.index].key;\n- return {\n- ...newState,\n- isTransitioning,\n- };\n} else if (action.type === replaceWithThreadActionType) {\nconst { threadInfo } = action;\nif (!lastState) {\n@@ -90,44 +47,28 @@ function ChatRouter(\nconst clearedState = removeScreensFromStack(\nlastState,\n(route: NavigationRoute) =>\n- route.routeName === ChatThreadListRouteName ? 'keep' : 'remove',\n+ route.name === ChatThreadListRouteName ? 'keep' : 'remove',\n);\n- const navigateAction = NavigationActions.navigate({\n- routeName: MessageListRouteName,\n+ const navigateAction = CommonActions.navigate({\n+ name: MessageListRouteName,\nkey: `${MessageListRouteName}${threadInfo.id}`,\nparams: { threadInfo },\n});\n- const newState = stackRouter.getStateForAction(\n- navigateAction,\n+ return stackRouter.getStateForAction(\nclearedState,\n+ navigateAction,\n+ options,\n);\n- if (!newState) {\n- return newState;\n- }\n- const isTransitioning =\n- lastState.routes[lastState.index].key !==\n- newState.routes[newState.index].key;\n- return {\n- ...newState,\n- isTransitioning,\n- };\n} else if (action.type === clearThreadsActionType) {\nconst threadIDs = new Set(action.threadIDs);\nif (!lastState) {\nreturn lastState;\n}\n- const newState = removeScreensFromStack(\n+ return removeScreensFromStack(\nlastState,\n(route: NavigationRoute) =>\nthreadIDs.has(getThreadIDFromRoute(route)) ? 'remove' : 'keep',\n);\n- const isTransitioning =\n- lastState.routes[lastState.index].key !==\n- newState.routes[newState.index].key;\n- return {\n- ...newState,\n- isTransitioning,\n- };\n} else if (action.type === pushNewThreadActionType) {\nconst { threadInfo } = action;\nif (!lastState) {\n@@ -136,33 +77,28 @@ function ChatRouter(\nconst clearedState = removeScreensFromStack(\nlastState,\n(route: NavigationRoute) =>\n- route.routeName === ComposeThreadRouteName ? 'remove' : 'break',\n+ route.name === ComposeThreadRouteName ? 'remove' : 'break',\n);\n- const navigateAction = NavigationActions.navigate({\n- routeName: MessageListRouteName,\n+ const navigateAction = CommonActions.navigate({\n+ name: MessageListRouteName,\nkey: `${MessageListRouteName}${threadInfo.id}`,\nparams: { threadInfo },\n});\n- const newState = stackRouter.getStateForAction(\n- navigateAction,\n+ return stackRouter.getStateForAction(\nclearedState,\n+ navigateAction,\n+ options,\n);\n- if (!newState) {\n- return newState;\n- }\n- const isTransitioning =\n- lastState.routes[lastState.index].key !==\n- newState.routes[newState.index].key;\n- return {\n- ...newState,\n- isTransitioning,\n- };\n} else {\n- return stackRouter.getStateForAction(action, lastState);\n+ return stackRouter.getStateForAction(\n+ lastState,\n+ action,\n+ options,\n+ );\n}\n},\n- getActionCreators: (route: NavigationRoute, navStateKey: ?string) => ({\n- ...stackRouter.getActionCreators(route, navStateKey),\n+ actionCreators: {\n+ ...stackRouter.actionCreators,\nclearScreens: (\nrouteNames: $ReadOnlyArray<string>,\npreserveFocus: boolean,\n@@ -187,7 +123,15 @@ function ChatRouter(\ntype: pushNewThreadActionType,\nthreadInfo,\n}),\n- }),\n+ },\n+ shouldActionChangeFocus: action => {\n+ if (action.type === replaceWithThreadActionType) {\n+ return true;\n+ } else if (action.type === pushNewThreadActionType) {\n+ return true;\n+ }\n+ return stackRouter.shouldActionChangeFocus(action);\n+ },\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-router.js",
"new_path": "native/navigation/overlay-router.js",
"diff": "// @flow\n-import {\n- StackRouter,\n- type NavigationAction,\n- type NavigationState,\n- type NavigationRoute,\n- type NavigationRouteConfigMap,\n- type NavigationStackRouterConfig,\n-} from 'react-navigation';\n+import { StackRouter } from '@react-navigation/native';\nimport { removeScreensFromStack } from '../utils/navigation-utils';\nimport { clearOverlayModalsActionType } from './action-types';\n-type ClearOverlayModalsAction = {|\n- +type: 'CLEAR_OVERLAY_MODALS',\n- +keys: $ReadOnlyArray<string>,\n- +preserveFocus?: boolean,\n-|};\n-export type OverlayRouterNavigationAction =\n- | NavigationAction\n- | ClearOverlayModalsAction;\n-\n-const defaultConfig = Object.freeze({});\n-function OverlayRouter(\n- routeConfigMap: NavigationRouteConfigMap,\n- stackConfig?: NavigationStackRouterConfig = defaultConfig,\n-) {\n- const stackRouter = StackRouter(routeConfigMap, stackConfig);\n+function OverlayRouter(options) {\n+ const stackRouter = StackRouter(options);\nreturn {\n...stackRouter,\ngetStateForAction: (\n- action: OverlayRouterNavigationAction,\n- lastState: ?NavigationState,\n+ lastState,\n+ action,\n+ options,\n) => {\nif (action.type === clearOverlayModalsActionType) {\nconst { keys } = action;\nif (!lastState) {\nreturn lastState;\n}\n- const newState = removeScreensFromStack(\n+ return removeScreensFromStack(\nlastState,\n(route: NavigationRoute) =>\nkeys.includes(route.key) ? 'remove' : 'keep',\n);\n- if (newState === lastState) {\n- return lastState;\n- }\n- const isTransitioning =\n- lastState.routes[lastState.index].key !==\n- newState.routes[newState.index].key;\n- return {\n- ...newState,\n- isTransitioning,\n- };\n} else {\n- return stackRouter.getStateForAction(action, lastState);\n+ return stackRouter.getStateForAction(lastState, action, options);\n}\n},\n- getActionCreators: (route: NavigationRoute, navStateKey: ?string) => ({\n- ...stackRouter.getActionCreators(route, navStateKey),\n+ actionCreators: {\n+ ...stackRouter.actionCreators,\nclearOverlayModals: (\nkeys: $ReadOnlyArray<string>,\npreserveFocus: boolean,\n@@ -67,7 +38,7 @@ function OverlayRouter(\nkeys,\npreserveFocus,\n}),\n- }),\n+ },\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/root-router.js",
"new_path": "native/navigation/root-router.js",
"diff": "// @flow\n-import {\n- StackRouter,\n- type NavigationAction,\n- type NavigationState,\n- type NavigationRoute,\n- type NavigationRouteConfigMap,\n- type NavigationStackRouterConfig,\n-} from 'react-navigation';\n+import { StackRouter, CommonActions } from '@react-navigation/native';\nimport { removeScreensFromStack } from '../utils/navigation-utils';\nimport {\n@@ -23,77 +16,72 @@ import {\nsetNavStateActionType,\n} from './action-types';\n-type LogInAction = {|\n- +type: 'LOG_IN',\n-|};\n-type LogOutAction = {|\n- +type: 'LOG_OUT',\n-|};\n-type ClearRootModalsAction = {|\n- +type: 'CLEAR_ROOT_MODALS',\n- +keys: $ReadOnlyArray<string>,\n- +preserveFocus?: boolean,\n-|};\n-type SetNavStateAction = {|\n- +type: 'SET_NAV_STATE',\n- +state: NavigationState,\n- +hideFromMonitor?: boolean,\n-|};\n-export type RootRouterNavigationAction =\n- | NavigationAction\n- | LogInAction\n- | LogOutAction\n- | ClearRootModalsAction\n- | SetNavStateAction;\n+function resetState(newPartialRoute, oldRoute) {\n+ if (oldRoute.state && oldRoute.state.stale) {\n+ // If React Navigation hasn't rehydrated the state for this navigator yet,\n+ // we can assume that it matches the default state. By keeping the old state\n+ // we prevent React Navigation from assigning a new key\n+ return oldRoute;\n+ }\n+ const newRoute = { ...oldRoute, ...newPartialRoute };\n+ if (!newRoute.state) {\n+ return newRoute;\n+ }\n+ const routes = [];\n+ for (let i = 0; i < newRoute.state.routes.length; i++) {\n+ routes.push(resetState(\n+ newPartialRoute.state.routes[i],\n+ oldRoute.state.routes[i],\n+ ));\n+ }\n+ return {\n+ ...newRoute,\n+ state: {\n+ ...oldRoute.state,\n+ ...newRoute.state,\n+ routes,\n+ },\n+ };\n+}\n-const defaultConfig = Object.freeze({});\n-function RootRouter(\n- routeConfigMap: NavigationRouteConfigMap,\n- stackConfig?: NavigationStackRouterConfig = defaultConfig,\n-) {\n- const stackRouter = StackRouter(routeConfigMap, stackConfig);\n+function RootRouter(options) {\n+ const stackRouter = StackRouter(options);\nreturn {\n...stackRouter,\ngetStateForAction: (\n- action: RootRouterNavigationAction,\n- lastState: ?NavigationState,\n+ lastState,\n+ action,\n+ options,\n) => {\nif (action.type === logInActionType) {\nif (!lastState) {\nreturn lastState;\n}\n- const newState = removeScreensFromStack(\n+ return removeScreensFromStack(\nlastState,\n(route: NavigationRoute) =>\n- accountModals.includes(route.routeName) ? 'remove' : 'keep',\n+ accountModals.includes(route.name) ? 'remove' : 'keep',\n);\n- if (newState === lastState) {\n- return lastState;\n- }\n- const isTransitioning =\n- lastState.routes[lastState.index].key !==\n- newState.routes[newState.index].key;\n- return {\n- ...newState,\n- isTransitioning,\n- };\n} else if (action.type === logOutActionType) {\nif (!lastState) {\nreturn lastState;\n}\nlet newState = { ...lastState };\n- newState.routes[0] = defaultNavigationState.routes[0];\n+ newState.routes[0] = resetState(\n+ defaultNavigationState.routes[0],\n+ newState.routes[0],\n+ );\nlet loggedOutModalFound = false;\nnewState = removeScreensFromStack(\nnewState,\n(route: NavigationRoute) => {\n- const { routeName } = route;\n- if (routeName === LoggedOutModalRouteName) {\n+ const { name } = route;\n+ if (name === LoggedOutModalRouteName) {\nloggedOutModalFound = true;\n}\n- return routeName === AppRouteName ||\n- accountModals.includes(routeName)\n+ return name === AppRouteName ||\n+ accountModals.includes(name)\n? 'keep'\n: 'remove';\n},\n@@ -106,51 +94,39 @@ function RootRouter(\nindex: newState.index + 1,\nroutes: [\nappRoute,\n- { key: 'LoggedOutModal', routeName: LoggedOutModalRouteName },\n+ { name: LoggedOutModalRouteName },\n...restRoutes,\n],\n};\n}\n- const isTransitioning =\n- lastState.routes[lastState.index].key !==\n- newState.routes[newState.index].key;\n- return {\n- ...newState,\n- isTransitioning,\n- };\n+ return stackRouter.getStateForAction(\n+ lastState,\n+ CommonActions.reset(newState),\n+ options,\n+ );\n} else if (action.type === clearRootModalsActionType) {\nconst { keys } = action;\nif (!lastState) {\nreturn lastState;\n}\n- const newState = removeScreensFromStack(\n+ return removeScreensFromStack(\nlastState,\n(route: NavigationRoute) =>\nkeys.includes(route.key) ? 'remove' : 'keep',\n);\n- if (newState === lastState) {\n- return lastState;\n- }\n- const isTransitioning =\n- lastState.routes[lastState.index].key !==\n- newState.routes[newState.index].key;\n- return {\n- ...newState,\n- isTransitioning,\n- };\n} else if (action.type === setNavStateActionType) {\nreturn action.state;\n} else {\nif (!lastState) {\nreturn lastState;\n}\n- const lastRouteName = lastState.routes[lastState.index].routeName;\n- const newState = stackRouter.getStateForAction(action, lastState);\n+ const newState = stackRouter.getStateForAction(lastState, action, options);\nif (!newState) {\nreturn newState;\n}\n- const newRouteName = newState.routes[newState.index].routeName;\n+ const lastRouteName = lastState.routes[lastState.index].name;\n+ const newRouteName = newState.routes[newState.index].name;\nif (\naccountModals.includes(lastRouteName) &&\n!accountModals.includes(newRouteName)\n@@ -160,8 +136,8 @@ function RootRouter(\nreturn newState;\n}\n},\n- getActionCreators: (route: NavigationRoute, navStateKey: ?string) => ({\n- ...stackRouter.getActionCreators(route, navStateKey),\n+ actionCreators: {\n+ ...stackRouter.actionCreators,\nlogIn: () => ({ type: logInActionType }),\nlogOut: () => ({ type: logOutActionType }),\nclearRootModals: (\n@@ -180,7 +156,7 @@ function RootRouter(\nstate,\nhideFromMonitor,\n}),\n- }),\n+ },\n};\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Update navigation routers for React Nav 5 |
129,187 | 14.05.2020 15:37:40 | 14,400 | 0cdc53c21a9adae21fba58a5a7bc4554b43ebce7 | [native] Update TabBar for React Nav 5 | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/tab-bar.react.js",
"new_path": "native/navigation/tab-bar.react.js",
"diff": "import * as React from 'react';\nimport { Platform } from 'react-native';\n-import { BottomTabBar } from 'react-navigation-tabs';\n+import { BottomTabBar } from '@react-navigation/bottom-tabs';\nimport {\ntype KeyboardState,\n@@ -26,4 +26,5 @@ function TabBar(props: Props) {\nreturn <BottomTabBar {...rest} />;\n}\n-export default withKeyboardState(TabBar);\n+const WrappedTabBar = withKeyboardState(TabBar);\n+export default props => <WrappedTabBar {...props} />;\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Update TabBar for React Nav 5 |
129,187 | 14.05.2020 15:38:03 | 14,400 | 026e959345675683da3878c11da02cd0b3b8f31c | [native] Update core navigation setup code for React Nav 5 | [
{
"change_type": "MODIFY",
"old_path": "native/chat/chat.react.js",
"new_path": "native/chat/chat.react.js",
"diff": "@@ -4,27 +4,18 @@ import type { ThreadInfo } from 'lib/types/thread-types';\nimport * as React from 'react';\nimport {\n- type NavigationRouteConfigMap,\n- type NavigationState,\n- createKeyboardAwareNavigator,\n- createNavigator,\n- type NavigationStackScreenOptions,\n-} from 'react-navigation';\n-import {\n- StackView,\n- type StackNavigatorConfig,\n- type NavigationStackProp,\n-} from 'react-navigation-stack';\n-import hoistNonReactStatics from 'hoist-non-react-statics';\n-import { StyleSheet } from 'react-native';\n+ createNavigatorFactory,\n+ useNavigationBuilder,\n+} from '@react-navigation/native';\n+import { StackView } from '@react-navigation/stack';\n+import { Platform, StyleSheet } from 'react-native';\n+import invariant from 'invariant';\nimport ChatThreadList from './chat-thread-list.react';\nimport MessageListContainer from './message-list-container.react';\nimport ComposeThread from './compose-thread.react';\nimport ThreadSettings from './settings/thread-settings.react';\n-import { getChatScreen } from './chat-screen-registry';\nimport DeleteThread from './settings/delete-thread.react';\n-import ChatIcon from './chat-icon.react';\nimport {\nComposeThreadRouteName,\nDeleteThreadRouteName,\n@@ -35,130 +26,104 @@ import {\nimport HeaderBackButton from '../navigation/header-back-button.react';\nimport ChatHeader from './chat-header.react';\nimport ChatRouter from './chat-router';\n-import { InputStateContext } from '../input/input-state';\nimport KeyboardAvoidingView from '../keyboard/keyboard-avoiding-view.react';\nimport MessageStorePruner from './message-store-pruner.react';\nimport ThreadScreenPruner from './thread-screen-pruner.react';\n+import ComposeThreadButton from './compose-thread-button.react';\n+import MessageListHeaderTitle from './message-list-header-title.react';\n+import ThreadSettingsButton from './thread-settings-button.react';\n+import { InputStateContext } from '../input/input-state';\n-export type ChatNavProp<State> = NavigationStackProp<State> & {\n- clearScreens: (\n- routeNames: $ReadOnlyArray<string>,\n- preserveFocus: boolean,\n- ) => void,\n- replaceWithThread: (threadInfo: ThreadInfo) => void,\n- clearThreads: (\n- threadIDs: $ReadOnlyArray<string>,\n- preserveFocus: boolean,\n- ) => void,\n- pushNewThread: (threadInfo: ThreadInfo) => void,\n-};\n-type Props = {| navigation: ChatNavProp<NavigationState> |};\n-type StackViewProps = React.ElementConfig<typeof StackView> & {\n- +navigation: ChatNavProp<NavigationState>,\n-};\n-\n-function createChatNavigator(\n- routeConfigMap: NavigationRouteConfigMap,\n- stackConfig?: StackNavigatorConfig = {},\n-) {\n- const {\n+function ChatNavigator({\ninitialRouteName,\n- initialRouteParams,\n- paths,\n- navigationOptions,\n- defaultNavigationOptions,\n- initialRouteKey,\n- ...navigatorConfig\n- } = stackConfig;\n- const routerConfig = {\n- initialRouteName,\n- initialRouteParams,\n- paths,\n- navigationOptions,\n- defaultNavigationOptions,\n- initialRouteKey,\n- };\n- return createKeyboardAwareNavigator<Props>(\n- createNavigator<\n- NavigationStackScreenOptions,\n- NavigationState,\n- StackNavigatorConfig,\n- ChatNavProp<NavigationState>,\n- StackViewProps,\n- >(StackView, ChatRouter(routeConfigMap, routerConfig), navigatorConfig),\n- navigatorConfig,\n- );\n-}\n-\n-const ChatNavigator = createChatNavigator(\n+ children,\n+ screenOptions,\n+ ...rest\n+}) {\n+ const { state, descriptors, navigation } = useNavigationBuilder(\n+ ChatRouter,\n{\n- [ChatThreadListRouteName]: ChatThreadList,\n- [MessageListRouteName]: MessageListContainer,\n- [ComposeThreadRouteName]: ComposeThread,\n- [ThreadSettingsRouteName]: ThreadSettings,\n- [DeleteThreadRouteName]: DeleteThread,\n- },\n- {\n- defaultNavigationOptions: ({ navigation }) => ({\n- header: ChatHeader,\n- headerLeft: navigation.isFirstRouteInParent()\n- ? undefined\n- : HeaderBackButton,\n- }),\n+ initialRouteName,\n+ children,\n+ screenOptions,\n},\n);\n-ChatNavigator.navigationOptions = {\n- // eslint-disable-next-line react/display-name\n- tabBarIcon: ({ tintColor }) => <ChatIcon color={tintColor} />,\n- tabBarOnPress: ({\n- navigation,\n- defaultHandler,\n- }: {\n- navigation: ChatNavProp<NavigationState>,\n- defaultHandler: () => void,\n- }) => {\n- if (!navigation.isFocused()) {\n- defaultHandler();\n- return;\n- }\n- const state = navigation.state;\n- const currentRoute = state.routes[state.index];\n- const chatScreen = getChatScreen(currentRoute.key);\n- if (!chatScreen) {\n- return;\n- }\n- if (chatScreen.canReset) {\n- navigation.popToTop();\n- }\n- },\n-};\n-function WrappedChatNavigator(props: Props) {\n- const { navigation } = props;\n+ // Clear ComposeThread screens after each message is sent. If a user goes to\n+ // ComposeThread to create a new thread, but finds an existing one and uses it\n+ // instead, we can assume the intent behind opening ComposeThread is resolved\nconst inputState = React.useContext(InputStateContext);\n-\n- const clearScreens = React.useCallback(\n- () => navigation.clearScreens([ComposeThreadRouteName], true),\n- [navigation],\n- );\n-\n+ invariant(inputState, 'InputState should be set in ChatNavigator');\n+ const clearComposeScreensAfterMessageSend = React.useCallback(() => {\n+ navigation.clearScreens([ComposeThreadRouteName], true);\n+ }, [navigation]);\nReact.useEffect(() => {\n- if (!inputState) {\n- return undefined;\n- }\n- inputState.registerSendCallback(clearScreens);\n- return () => inputState.unregisterSendCallback(clearScreens);\n- }, [inputState, clearScreens]);\n+ inputState.registerSendCallback(clearComposeScreensAfterMessageSend);\n+ return () => {\n+ inputState.unregisterSendCallback(clearComposeScreensAfterMessageSend);\n+ };\n+ }, [inputState, clearComposeScreensAfterMessageSend]);\nreturn (\n- <KeyboardAvoidingView style={styles.keyboardAvoidingView}>\n- <ChatNavigator {...props} />\n- <MessageStorePruner />\n- <ThreadScreenPruner />\n- </KeyboardAvoidingView>\n+ <StackView\n+ {...rest}\n+ state={state}\n+ descriptors={descriptors}\n+ navigation={navigation}\n+ />\n);\n}\n-hoistNonReactStatics(WrappedChatNavigator, ChatNavigator);\n+const createChatNavigator = createNavigatorFactory(ChatNavigator);\n+\n+const header = props => <ChatHeader {...props} />;\n+const headerBackButton = props => <HeaderBackButton {...props} />;\n+const screenOptions = {\n+ header,\n+ headerLeft: headerBackButton,\n+};\n+\n+const chatThreadListOptions = ({ navigation }) => ({\n+ headerTitle: 'Threads',\n+ headerRight:\n+ Platform.OS === 'ios' ? (\n+ () => <ComposeThreadButton navigate={navigation.navigate} />\n+ ) : null,\n+ headerBackTitle: 'Back',\n+});\n+const messageListOptions = ({ navigation, route }) => ({\n+ headerTitle: () => (\n+ <MessageListHeaderTitle\n+ threadInfo={route.params.threadInfo}\n+ navigate={navigation.navigate}\n+ />\n+ ),\n+ headerTitleContainerStyle: {\n+ marginHorizontal: Platform.select({ ios: 80, default: 0 }),\n+ flex: 1,\n+ },\n+ headerRight:\n+ Platform.OS === 'android' ? (\n+ () => (\n+ <ThreadSettingsButton\n+ threadInfo={route.params.threadInfo}\n+ navigate={navigation.navigate}\n+ />\n+ )\n+ ) : null,\n+ headerBackTitle: 'Back',\n+});\n+const composeThreadOptions = {\n+ headerTitle: 'Compose thread',\n+ headerBackTitle: 'Back',\n+};\n+const threadSettingsOptions = ({ route }) => ({\n+ headerTitle: route.params.threadInfo.uiName,\n+ headerBackTitle: 'Back',\n+});\n+const deleteThreadOptions = {\n+ headerTitle: 'Delete thread',\n+ headerBackTitle: 'Back',\n+};\nconst styles = StyleSheet.create({\nkeyboardAvoidingView: {\n@@ -166,4 +131,37 @@ const styles = StyleSheet.create({\n},\n});\n-export default WrappedChatNavigator;\n+const Chat = createChatNavigator();\n+export default () => (\n+ <KeyboardAvoidingView style={styles.keyboardAvoidingView}>\n+ <Chat.Navigator screenOptions={screenOptions}>\n+ <Chat.Screen\n+ name={ChatThreadListRouteName}\n+ component={ChatThreadList}\n+ options={chatThreadListOptions}\n+ />\n+ <Chat.Screen\n+ name={MessageListRouteName}\n+ component={MessageListContainer}\n+ options={messageListOptions}\n+ />\n+ <Chat.Screen\n+ name={ComposeThreadRouteName}\n+ component={ComposeThread}\n+ options={composeThreadOptions}\n+ />\n+ <Chat.Screen\n+ name={ThreadSettingsRouteName}\n+ component={ThreadSettings}\n+ options={threadSettingsOptions}\n+ />\n+ <Chat.Screen\n+ name={DeleteThreadRouteName}\n+ component={DeleteThread}\n+ options={deleteThreadOptions}\n+ />\n+ </Chat.Navigator>\n+ <MessageStorePruner />\n+ <ThreadScreenPruner />\n+ </KeyboardAvoidingView>\n+);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/more/more.react.js",
"new_path": "native/more/more.react.js",
"diff": "// @flow\nimport * as React from 'react';\n-import { StyleSheet } from 'react-native';\n-import Icon from 'react-native-vector-icons/FontAwesome';\n-import { createStackNavigator } from 'react-navigation-stack';\n+import { createStackNavigator } from '@react-navigation/stack';\nimport MoreScreen from './more-screen.react';\nimport EditEmail from './edit-email.react';\n@@ -24,37 +22,57 @@ import {\nimport MoreHeader from './more-header.react';\nimport HeaderBackButton from '../navigation/header-back-button.react';\n-const More = createStackNavigator(\n- {\n- [MoreScreenRouteName]: MoreScreen,\n- [EditEmailRouteName]: EditEmail,\n- [EditPasswordRouteName]: EditPassword,\n- [DeleteAccountRouteName]: DeleteAccount,\n- [BuildInfoRouteName]: BuildInfo,\n- [DevToolsRouteName]: DevTools,\n- [AppearancePreferencesRouteName]: AppearancePreferences,\n- },\n- {\n- defaultNavigationOptions: ({ navigation }) => ({\n- header: MoreHeader,\n- headerLeft: navigation.isFirstRouteInParent()\n- ? undefined\n- : HeaderBackButton,\n- }),\n- },\n-);\n-More.navigationOptions = {\n- tabBarLabel: 'More',\n- // eslint-disable-next-line react/display-name\n- tabBarIcon: ({ tintColor }) => (\n- <Icon name=\"bars\" style={[styles.icon, { color: tintColor }]} />\n- ),\n+const header = props => <MoreHeader {...props} />;\n+const headerBackButton = props => <HeaderBackButton {...props} />;\n+const screenOptions = {\n+ header,\n+ headerLeft: headerBackButton,\n};\n+const moreScreenOptions = { headerTitle: 'More' };\n+const editEmailOptions = { headerTitle: 'Change email' };\n+const editPasswordOptions = { headerTitle: 'Change password' };\n+const deleteAccountOptions = { headerTitle: 'Delete account' };\n+const buildInfoOptions = { headerTitle: 'Build info' };\n+const devToolsOptions = { headerTitle: 'Developer tools' };\n+const appearanceOptions = { headerTitle: 'Appearance' };\n-const styles = StyleSheet.create({\n- icon: {\n- fontSize: 28,\n- },\n-});\n-\n-export default More;\n+const More = createStackNavigator();\n+export default () => (\n+ <More.Navigator screenOptions={screenOptions}>\n+ <More.Screen\n+ name={MoreScreenRouteName}\n+ component={MoreScreen}\n+ options={moreScreenOptions}\n+ />\n+ <More.Screen\n+ name={EditEmailRouteName}\n+ component={EditEmail}\n+ options={editEmailOptions}\n+ />\n+ <More.Screen\n+ name={EditPasswordRouteName}\n+ component={EditPassword}\n+ options={editPasswordOptions}\n+ />\n+ <More.Screen\n+ name={DeleteAccountRouteName}\n+ component={DeleteAccount}\n+ options={deleteAccountOptions}\n+ />\n+ <More.Screen\n+ name={BuildInfoRouteName}\n+ component={BuildInfo}\n+ options={buildInfoOptions}\n+ />\n+ <More.Screen\n+ name={DevToolsRouteName}\n+ component={DevTools}\n+ options={devToolsOptions}\n+ />\n+ <More.Screen\n+ name={AppearancePreferencesRouteName}\n+ component={AppearancePreferences}\n+ options={appearanceOptions}\n+ />\n+ </More.Navigator>\n+);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/app-navigator.react.js",
"new_path": "native/navigation/app-navigator.react.js",
"diff": "// @flow\n-import type { NavigationStackProp } from 'react-navigation-stack';\n-import type { NavigationStateRoute } from 'react-navigation';\n-\nimport * as React from 'react';\n-import { createBottomTabNavigator } from 'react-navigation-tabs';\n-import hoistNonReactStatics from 'hoist-non-react-statics';\n+import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';\nimport { PersistGate } from 'redux-persist/integration/react';\nimport SplashScreen from 'react-native-splash-screen';\n-import { Platform } from 'react-native';\n+import { Platform, StyleSheet } from 'react-native';\n+import Icon from 'react-native-vector-icons/FontAwesome';\nimport {\nCalendarRouteName,\n@@ -38,38 +35,62 @@ import PushHandler from '../push/push-handler.react';\nimport { getPersistor } from '../redux/persist';\nimport { RootContext } from '../root-context';\nimport { waitForInteractions } from '../utils/interactions';\n+import ChatIcon from '../chat/chat-icon.react';\n-const TabNavigator = createBottomTabNavigator(\n- {\n- [CalendarRouteName]: { screen: Calendar },\n- [ChatRouteName]: { screen: Chat },\n- [MoreRouteName]: { screen: More },\n- },\n- {\n- initialRouteName: CalendarRouteName,\n- lazy: false,\n- tabBarComponent: TabBar,\n- backBehavior: 'none',\n- tabBarOptions: {\n- keyboardHidesTabBar: false,\n- },\n- },\n+const calendarTabOptions = {\n+ tabBarLabel: 'Calendar',\n+ // eslint-disable-next-line react/display-name\n+ tabBarIcon: ({ color }) => (\n+ <Icon name=\"calendar\" style={[styles.icon, { color }]} />\n+ ),\n+};\n+const chatTabOptions = {\n+ tabBarLabel: 'Chat',\n+ // eslint-disable-next-line react/display-name\n+ tabBarIcon: ({ color }) => <ChatIcon color={color} />,\n+};\n+const moreTabOptions = {\n+ tabBarLabel: 'More',\n+ // eslint-disable-next-line react/display-name\n+ tabBarIcon: ({ color }) => (\n+ <Icon name=\"bars\" style={[styles.icon, { color }]} />\n+ ),\n+};\n+\n+const Tab = createBottomTabNavigator();\n+const tabBarOptions = { keyboardHidesTabBar: false };\n+function TabNavigator() {\n+ return (\n+ <Tab.Navigator\n+ initialRouteName={ChatRouteName}\n+ lazy={false}\n+ tabBar={TabBar}\n+ backBehavior=\"none\"\n+ tabBarOptions={tabBarOptions}\n+ >\n+ <Tab.Screen\n+ name={CalendarRouteName}\n+ component={Calendar}\n+ options={calendarTabOptions}\n+ />\n+ <Tab.Screen\n+ name={ChatRouteName}\n+ component={Chat}\n+ options={chatTabOptions}\n+ />\n+ <Tab.Screen\n+ name={MoreRouteName}\n+ component={More}\n+ options={moreTabOptions}\n+ />\n+ </Tab.Navigator>\n);\n+}\n-const AppNavigator = createOverlayNavigator({\n- [TabNavigatorRouteName]: TabNavigator,\n- [MultimediaModalRouteName]: MultimediaModal,\n- [MultimediaTooltipModalRouteName]: MultimediaTooltipModal,\n- [ActionResultModalRouteName]: ActionResultModal,\n- [TextMessageTooltipModalRouteName]: TextMessageTooltipModal,\n- [ThreadSettingsMemberTooltipModalRouteName]: ThreadSettingsMemberTooltipModal,\n- [CameraModalRouteName]: CameraModal,\n-});\n+const App = createOverlayNavigator();\n+function AppNavigator(props) {\n+ const { navigation } = props;\n-type Props = {|\n- navigation: NavigationStackProp<NavigationStateRoute>,\n-|};\n-function WrappedAppNavigator(props: Props) {\nconst rootContext = React.useContext(RootContext);\nconst setNavStateInitialized =\nrootContext && rootContext.setNavStateInitialized;\n@@ -85,16 +106,49 @@ function WrappedAppNavigator(props: Props) {\n}\n}, []);\n- const { navigation } = props;\nreturn (\n<KeyboardStateContainer>\n- <AppNavigator navigation={navigation} />\n+ <App.Navigator>\n+ <App.Screen\n+ name={TabNavigatorRouteName}\n+ component={TabNavigator}\n+ />\n+ <App.Screen\n+ name={MultimediaModalRouteName}\n+ component={MultimediaModal}\n+ />\n+ <App.Screen\n+ name={MultimediaTooltipModalRouteName}\n+ component={MultimediaTooltipModal}\n+ />\n+ <App.Screen\n+ name={ActionResultModalRouteName}\n+ component={ActionResultModal}\n+ />\n+ <App.Screen\n+ name={TextMessageTooltipModalRouteName}\n+ component={TextMessageTooltipModal}\n+ />\n+ <App.Screen\n+ name={ThreadSettingsMemberTooltipModalRouteName}\n+ component={ThreadSettingsMemberTooltipModal}\n+ />\n+ <App.Screen\n+ name={CameraModalRouteName}\n+ component={CameraModal}\n+ />\n+ </App.Navigator>\n<PersistGate persistor={getPersistor()}>\n<PushHandler navigation={navigation} />\n</PersistGate>\n</KeyboardStateContainer>\n);\n}\n-hoistNonReactStatics(WrappedAppNavigator, AppNavigator);\n-export default WrappedAppNavigator;\n+const styles = {\n+ icon: {\n+ fontSize: 28,\n+ },\n+};\n+\n+export default AppNavigator;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/root-navigator.react.js",
"new_path": "native/navigation/root-navigator.react.js",
"diff": "// @flow\nimport * as React from 'react';\n-import {\n- type NavigationRouteConfigMap,\n- type NavigationState,\n- createNavigator,\n- type NavigationStackScreenOptions,\n-} from 'react-navigation';\n-import {\n- StackView,\n- StackViewTransitionConfigs,\n- type StackNavigatorConfig,\n- type NavigationStackProp,\n- type NavigationStackTransitionProps,\n-} from 'react-navigation-stack';\n-import { Keyboard } from 'react-native';\n+import { Platform } from 'react-native';\nimport { enableScreens } from 'react-native-screens';\n+import {\n+ createNavigatorFactory,\n+ useNavigationBuilder,\n+} from '@react-navigation/native';\n+import { StackView, TransitionPresets } from '@react-navigation/stack';\nimport {\nLoggedOutModalRouteName,\n@@ -37,123 +29,126 @@ import CustomServerModal from '../more/custom-server-modal.react';\nimport ColorPickerModal from '../chat/settings/color-picker-modal.react';\nimport ComposeSubthreadModal from '../chat/settings/compose-subthread-modal.react';\nimport RootRouter from './root-router';\n+import { RootNavigatorContext } from './root-navigator-context';\nenableScreens();\n-type NavigationProp = NavigationStackProp<NavigationState> & {\n- logIn: () => void,\n- logOut: () => void,\n- clearRootModals: (\n- keys: $ReadOnlyArray<string>,\n- preserveFocus: boolean,\n- ) => void,\n- setNavState: (state: NavigationState) => void,\n-};\n-type StackViewProps = React.ElementConfig<typeof StackView> & {\n- +navigation: NavigationProp,\n-};\n-\n-function createRootNavigator(\n- routeConfigMap: NavigationRouteConfigMap,\n- stackConfig?: StackNavigatorConfig = {},\n-) {\n- const {\n+function RootNavigator({\ninitialRouteName,\n- initialRouteParams,\n- paths,\n- navigationOptions,\n- defaultNavigationOptions,\n- initialRouteKey,\n- ...navigatorConfig\n- } = stackConfig;\n- const routerConfig = {\n- initialRouteName,\n- initialRouteParams,\n- paths,\n- navigationOptions,\n- defaultNavigationOptions,\n- initialRouteKey,\n- };\n- return createNavigator<\n- NavigationStackScreenOptions,\n- NavigationState,\n- StackNavigatorConfig,\n- NavigationProp,\n- StackViewProps,\n- >(StackView, RootRouter(routeConfigMap, routerConfig), navigatorConfig);\n-}\n-\n-const RootNavigator = createRootNavigator(\n- {\n- [LoggedOutModalRouteName]: LoggedOutModal,\n- [VerificationModalRouteName]: VerificationModal,\n- [AppRouteName]: AppNavigator,\n- [ThreadPickerModalRouteName]: ThreadPickerModal,\n- [AddUsersModalRouteName]: AddUsersModal,\n- [CustomServerModalRouteName]: CustomServerModal,\n- [ColorPickerModalRouteName]: ColorPickerModal,\n- [ComposeSubthreadModalRouteName]: ComposeSubthreadModal,\n- },\n+ children,\n+ screenOptions,\n+ ...rest\n+}) {\n+ const { state, descriptors, navigation } = useNavigationBuilder(\n+ RootRouter,\n{\n- headerMode: 'none',\n- mode: 'modal',\n- transparentCard: true,\n- disableKeyboardHandling: true,\n- onTransitionStart: (\n- transitionProps: NavigationStackTransitionProps,\n- prevTransitionProps: ?NavigationStackTransitionProps,\n- ) => {\n- if (!prevTransitionProps) {\n- return;\n- }\n- const { scene } = transitionProps;\n- const { route } = scene;\n- const { scene: prevScene } = prevTransitionProps;\n- const { route: prevRoute } = prevScene;\n- if (route.key === prevRoute.key) {\n- return;\n- }\n- if (\n- route.routeName !== AppRouteName ||\n- prevRoute.routeName !== ThreadPickerModalRouteName\n- ) {\n- Keyboard.dismiss();\n- }\n+ initialRouteName,\n+ children,\n+ screenOptions,\n},\n- transitionConfig: (\n- transitionProps: NavigationStackTransitionProps,\n- prevTransitionProps: ?NavigationStackTransitionProps,\n- isModal: boolean,\n- ) => {\n- const defaultConfig = StackViewTransitionConfigs.defaultTransitionConfig(\n- transitionProps,\n- prevTransitionProps,\n- isModal,\n);\n- return {\n- ...defaultConfig,\n- screenInterpolator: sceneProps => {\n- const {\n- opacity: defaultOpacity,\n- ...defaultInterpolation\n- } = defaultConfig.screenInterpolator(sceneProps);\n- const { position, scene } = sceneProps;\n- const { index, route } = scene;\n- if (\n- accountModals.includes(route.routeName) ||\n- route.routeName === AppRouteName\n- ) {\n- return defaultInterpolation;\n+\n+ const [keyboardHandlingEnabled, setKeyboardHandlingEnabled] =\n+ React.useState(true);\n+ const rootNavigationContext = React.useMemo(\n+ () => ({ setKeyboardHandlingEnabled }),\n+ [setKeyboardHandlingEnabled],\n+ );\n+\n+ return (\n+ <RootNavigatorContext.Provider value={rootNavigationContext}>\n+ <StackView\n+ {...rest}\n+ state={state}\n+ descriptors={descriptors}\n+ navigation={navigation}\n+ keyboardHandlingEnabled={keyboardHandlingEnabled}\n+ />\n+ </RootNavigatorContext.Provider>\n+ );\n}\n- const opacity = position.interpolate({\n- inputRange: [index - 1, index],\n- outputRange: ([0, 1]: number[]),\n+const createRootNavigator = createNavigatorFactory(RootNavigator);\n+\n+const baseTransitionPreset = Platform.select({\n+ ios: TransitionPresets.ModalSlideFromBottomIOS,\n+ default: TransitionPresets.FadeFromBottomAndroid,\n});\n- return { ...defaultInterpolation, opacity };\n+const transitionPreset = {\n+ ...baseTransitionPreset,\n+ cardStyleInterpolator: interpolatorProps => {\n+ const baseCardStyleInterpolator =\n+ baseTransitionPreset.cardStyleInterpolator(interpolatorProps);\n+ const overlayOpacity = interpolatorProps.current.progress.interpolate({\n+ inputRange: [0, 1],\n+ outputRange: [0, 0.7],\n+ extrapolate: 'clamp',\n+ });\n+ return {\n+ ...baseCardStyleInterpolator,\n+ overlayStyle: {\n+ ...baseCardStyleInterpolator.overlayStyle,\n+ opacity: overlayOpacity,\n},\n};\n},\n- },\n-);\n+};\n-export default RootNavigator;\n+const Root = createRootNavigator();\n+const defaultScreenOptions = {\n+ gestureEnabled: Platform.OS === 'ios',\n+ animationEnabled: Platform.OS !== 'web',\n+ cardStyle: { backgroundColor: 'transparent' },\n+ ...transitionPreset,\n+};\n+const disableGesturesScreenOptions = {\n+ gestureEnabled: false,\n+};\n+const modalOverlayScreenOptions = {\n+ cardOverlayEnabled: true,\n+};\n+export default () => (\n+ <Root.Navigator\n+ mode=\"modal\"\n+ headerMode=\"none\"\n+ screenOptions={defaultScreenOptions}\n+ >\n+ <Root.Screen\n+ name={LoggedOutModalRouteName}\n+ component={LoggedOutModal}\n+ options={disableGesturesScreenOptions}\n+ />\n+ <Root.Screen\n+ name={VerificationModalRouteName}\n+ component={VerificationModal}\n+ />\n+ <Root.Screen\n+ name={AppRouteName}\n+ component={AppNavigator}\n+ />\n+ <Root.Screen\n+ name={ThreadPickerModalRouteName}\n+ component={ThreadPickerModal}\n+ options={modalOverlayScreenOptions}\n+ />\n+ <Root.Screen\n+ name={AddUsersModalRouteName}\n+ component={AddUsersModal}\n+ options={modalOverlayScreenOptions}\n+ />\n+ <Root.Screen\n+ name={CustomServerModalRouteName}\n+ component={CustomServerModal}\n+ options={modalOverlayScreenOptions}\n+ />\n+ <Root.Screen\n+ name={ColorPickerModalRouteName}\n+ component={ColorPickerModal}\n+ options={modalOverlayScreenOptions}\n+ />\n+ <Root.Screen\n+ name={ComposeSubthreadModalRouteName}\n+ component={ComposeSubthreadModal}\n+ options={modalOverlayScreenOptions}\n+ />\n+ </Root.Navigator>\n+);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/root.react.js",
"new_path": "native/root.react.js",
"diff": "import { type GlobalTheme, globalThemePropType } from './types/themes';\nimport type { AppState } from './redux/redux-setup';\nimport type { NavAction } from './navigation/navigation-context';\n+import type { NavigationState } from 'react-navigation';\nimport * as React from 'react';\nimport { Provider } from 'react-redux';\nimport { Platform, UIManager, View, StyleSheet } from 'react-native';\nimport Orientation from 'react-native-orientation-locker';\nimport { PersistGate } from 'redux-persist/integration/react';\n-import {\n- type SupportedThemes,\n- type NavigationState,\n- createAppContainer,\n- NavigationActions,\n-} from 'react-navigation';\nimport AsyncStorage from '@react-native-community/async-storage';\n+import {\n+ NavigationContainer,\n+ CommonActions,\n+} from '@react-navigation/native';\n+import invariant from 'invariant';\n+import { SafeAreaProvider } from 'react-native-safe-area-context';\nimport { connect } from 'lib/utils/redux-utils';\nimport { actionLogger } from 'lib/utils/action-logger';\n@@ -42,29 +43,13 @@ import { defaultNavigationState } from './navigation/default-state';\nimport InputStateContainer from './input/input-state-container.react';\nimport './themes/fonts';\nimport LifecycleHandler from './lifecycle/lifecycle-handler.react';\n+import { DarkTheme, LightTheme } from './themes/navigation';\nif (Platform.OS === 'android') {\nUIManager.setLayoutAnimationEnabledExperimental &&\nUIManager.setLayoutAnimationEnabledExperimental(true);\n}\n-type NavContainer = React.AbstractComponent<\n- {|\n- theme?: SupportedThemes | 'no-preference',\n- loadNavigationState?: () => Promise<NavigationState>,\n- onNavigationStateChange?: (\n- prevState: NavigationState,\n- state: NavigationState,\n- action: NavAction,\n- ) => void,\n- persistNavigationState?: (state: NavigationState) => Promise<void>,\n- |},\n- {\n- dispatch: (action: NavAction) => boolean,\n- },\n->;\n-const NavAppContainer: NavContainer = (createAppContainer(RootNavigator): any);\n-\nconst navStateAsyncStorageKey = 'navState';\ntype Props = {\n@@ -74,6 +59,7 @@ type Props = {\ntype State = {|\nnavContext: ?NavContextType,\nrootContext: RootContextType,\n+ initialState: ?NavigationState,\n|};\nclass Root extends React.PureComponent<Props, State> {\nstatic propTypes = {\n@@ -89,18 +75,47 @@ class Root extends React.PureComponent<Props, State> {\nthis.state = {\nnavContext: null,\nrootContext: { setNavStateInitialized: this.setNavStateInitialized },\n+ initialState: null,\n};\n}\ncomponentDidMount() {\nOrientation.lockToPortrait();\n+ this.loadInitialState();\n+ }\n+\n+ async loadInitialState() {\n+ let initialState;\n+ if (__DEV__) {\n+ try {\n+ const navStateString = await AsyncStorage.getItem(\n+ navStateAsyncStorageKey,\n+ );\n+ if (navStateString) {\n+ initialState = JSON.parse(navStateString);\n+ }\n+ } catch {}\n+ }\n+ if (!initialState) {\n+ initialState = defaultNavigationState;\n+ }\n+ this.navState = initialState;\n+ this.setNavContext();\n+ this.setState({ initialState });\n+ };\n+\n+ get theme() {\n+ const { activeTheme } = this.props;\n+ if (activeTheme === 'light') {\n+ return LightTheme;\n+ } else if (activeTheme === 'dark') {\n+ return DarkTheme;\n+ }\n+ return undefined;\n}\nrender() {\nconst { detectUnsupervisedBackgroundRef } = this;\n- const reactNavigationTheme = this.props.activeTheme\n- ? this.props.activeTheme\n- : 'no-preference';\nconst gated: React.Node = (\n<>\n<LifecycleHandler />\n@@ -114,24 +129,30 @@ class Root extends React.PureComponent<Props, State> {\n<OrientationHandler />\n</>\n);\n- const persistNavigationState = __DEV__\n- ? this.persistNavigationState\n- : undefined;\n+ let navContainer;\n+ if (this.state.initialState) {\n+ navContainer = (\n+ <NavigationContainer\n+ initialState={this.state.initialState}\n+ onStateChange={this.onNavigationStateChange}\n+ theme={this.theme}\n+ ref={this.navContainerRef}\n+ >\n+ <RootNavigator />\n+ </NavigationContainer>\n+ );\n+ }\nreturn (\n<View style={styles.app}>\n<NavContext.Provider value={this.state.navContext}>\n<RootContext.Provider value={this.state.rootContext}>\n<InputStateContainer>\n+ <SafeAreaProvider>\n<ConnectedStatusBar />\n<PersistGate persistor={getPersistor()}>{gated}</PersistGate>\n- <NavAppContainer\n- theme={reactNavigationTheme}\n- loadNavigationState={this.loadNavigationState}\n- onNavigationStateChange={this.onNavigationStateChange}\n- persistNavigationState={persistNavigationState}\n- ref={this.appContainerRef}\n- />\n+ {navContainer}\n<NavigationHandler />\n+ </SafeAreaProvider>\n</InputStateContainer>\n</RootContext.Provider>\n</NavContext.Provider>\n@@ -150,50 +171,23 @@ class Root extends React.PureComponent<Props, State> {\n}));\n};\n- loadNavigationState = async () => {\n- let navState;\n- if (__DEV__) {\n- const navStateString = await AsyncStorage.getItem(\n- navStateAsyncStorageKey,\n- );\n- if (navStateString) {\n- try {\n- navState = JSON.parse(navStateString);\n- } catch (e) {\n- console.log('JSON.parse threw while trying to dehydrate navState', e);\n- }\n- }\n- }\n- if (!navState) {\n- navState = defaultNavigationState;\n- }\n- this.navState = navState;\n- this.setNavContext();\n- actionLogger.addOtherAction(\n- 'navState',\n- NavigationActions.init(),\n- null,\n- navState,\n- );\n- return navState;\n- };\n-\n- onNavigationStateChange = (\n- prevState: NavigationState,\n- state: NavigationState,\n- action: NavAction,\n- ) => {\n+ onNavigationStateChange = (state: ?NavigationState) => {\n+ invariant(state, 'nav state should be non-null');\nthis.navState = state;\nthis.setNavContext();\n- actionLogger.addOtherAction('navState', action, prevState, state);\n+ if (__DEV__) {\n+ this.persistNavigationState(state);\n+ }\n};\n- appContainerRef = (appContainer: ?React.ElementRef<NavContainer>) => {\n- if (!appContainer) {\n+ navContainerRef = (navContainer: ?React.ElementRef<NavigationContainer>) => {\n+ if (!navContainer) {\nreturn;\n}\n- this.navDispatch = appContainer.dispatch;\n+ if (!this.navDispatch) {\n+ this.navDispatch = navContainer.dispatch;\nthis.setNavContext();\n+ }\n};\nsetNavContext() {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Update core navigation setup code for React Nav 5 |
129,187 | 14.05.2020 15:42:15 | 14,400 | 25b4823cd8d1f1a13edfab62bb06929a3cc92550 | [native] Wrap KeyboardStateContainer children in flex div
React Nav 5 must be absolutely-positioning the contents | [
{
"change_type": "MODIFY",
"old_path": "native/keyboard/keyboard-state-container.react.js",
"new_path": "native/keyboard/keyboard-state-container.react.js",
"diff": "import * as React from 'react';\nimport PropTypes from 'prop-types';\nimport { KeyboardUtils } from 'react-native-keyboard-input';\n-import { Platform } from 'react-native';\n+import { Platform, View, StyleSheet } from 'react-native';\nimport {\naddKeyboardShowListener,\n@@ -107,17 +107,29 @@ class KeyboardStateContainer extends React.PureComponent<Props, State> {\nhideMediaGallery,\ngetMediaGalleryThreadID,\n};\n- const keyboardInputHost =\n- Platform.OS === 'android' && mediaGalleryOpen ? (\n- <KeyboardInputHost />\n- ) : null;\n+ if (Platform.OS !== 'android') {\nreturn (\n<KeyboardContext.Provider value={keyboardState}>\n{this.props.children}\n+ </KeyboardContext.Provider>\n+ );\n+ }\n+ const keyboardInputHost = mediaGalleryOpen ? <KeyboardInputHost /> : null;\n+ return (\n+ <KeyboardContext.Provider value={keyboardState}>\n+ <View style={styles.container}>\n+ {this.props.children}\n+ </View>\n{keyboardInputHost}\n</KeyboardContext.Provider>\n);\n}\n}\n+const styles = StyleSheet.create({\n+ container: {\n+ flex: 1,\n+ },\n+});\n+\nexport default KeyboardStateContainer;\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Wrap KeyboardStateContainer children in flex div
React Nav 5 must be absolutely-positioning the contents |
129,187 | 14.05.2020 16:48:49 | 14,400 | d5ce45d58e0c5caa7d90683df2ef54a465b571c5 | [native] Move OverlayNavigator animation start to useEffect | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-navigator.react.js",
"new_path": "native/navigation/overlay-navigator.react.js",
"diff": "@@ -126,6 +126,11 @@ const OverlayNavigator = React.memo<Props>(({\nconst prevSceneDataRef = React.useRef(sceneData);\nconst prevSceneData = prevSceneDataRef.current;\n+ // We need to initiate animations in useEffect blocks, but because we setState\n+ // within render we might have multiple renders before the useEffect triggers.\n+ // So we cache whether or not a new animation should be started in this ref\n+ const pendingAnimationRef = React.useRef(false);\n+\n// This block keeps sceneData updated when our props change. It's the\n// hook equivalent of getDerivedStateFromProps\n// https://reactjs.org/docs/hooks-faq.html#how-do-i-implement-getderivedstatefromprops\n@@ -218,11 +223,7 @@ const OverlayNavigator = React.memo<Props>(({\nif (sceneAdded || dismissingSceneData) {\n// We start an animation whenever a scene is added or dismissed\n- timing(position, {\n- duration: 250,\n- easing: Easing.inOut(Easing.ease),\n- toValue: curIndex,\n- }).start();\n+ pendingAnimationRef.current = true;\n}\n// We want to keep at most one dismissing scene in the sceneData at a time\n@@ -243,6 +244,19 @@ const OverlayNavigator = React.memo<Props>(({\n}\n}\n+ const startAnimation = pendingAnimationRef.current;\n+ React.useEffect(() => {\n+ if (!startAnimation) {\n+ return;\n+ }\n+ pendingAnimationRef.current = false;\n+ timing(position, {\n+ duration: 250,\n+ easing: Easing.inOut(Easing.ease),\n+ toValue: curIndex,\n+ }).start();\n+ }, [position, startAnimation, curIndex]);\n+\n// If sceneData changes, we update scrollBlockingModalStatus based on it, both\n// in state and within the individual sceneData contexts. If sceneData doesn't\n// change, it's still possible for scrollBlockingModalStatus to change via the\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Move OverlayNavigator animation start to useEffect |
129,187 | 14.05.2020 16:49:10 | 14,400 | 6910e180a9769d2069aacf4fe101dfa260334a83 | [native] Fix MessageList failing to toggle Message focus | [
{
"change_type": "MODIFY",
"old_path": "native/chat/message-list.react.js",
"new_path": "native/chat/message-list.react.js",
"diff": "@@ -164,7 +164,7 @@ class MessageList extends React.PureComponent<Props, State> {\nstatic modalOpen(props: Props) {\nconst overlayContext = MessageList.getOverlayContext(props);\n- return overlayContext.scrollBlockingModalStatus !== 'open';\n+ return overlayContext.scrollBlockingModalStatus === 'open';\n}\ncomponentDidUpdate(prevProps: Props) {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Fix MessageList failing to toggle Message focus |
129,187 | 14.05.2020 19:14:23 | 14,400 | 63f3046e447d2d9e2983ddbccee78205da359ffc | [native] Add container that flexes to full screen in OverlayNavigator | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-navigator.react.js",
"new_path": "native/navigation/overlay-navigator.react.js",
"diff": "@@ -356,7 +356,9 @@ const OverlayNavigator = React.memo<Props>(({\nreturn (\n<NavigationHelpersContext.Provider value={navigation}>\n+ <View style={styles.container}>\n{screens}\n+ </View>\n</NavigationHelpersContext.Provider>\n);\n});\n@@ -364,6 +366,9 @@ OverlayNavigator.displayName = 'OverlayNavigator';\nconst createOverlayNavigator = createNavigatorFactory(OverlayNavigator);\nconst styles = StyleSheet.create({\n+ container: {\n+ flex: 1,\n+ },\nscene: {\nbottom: 0,\nleft: 0,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Add container that flexes to full screen in OverlayNavigator |
129,187 | 15.05.2020 12:30:16 | 14,400 | 9c3d3f85c76fd340595ebbc341bdae9c63d8d165 | [native] Avoid onLayout in KeyboardAccessoryView if not needed | [
{
"change_type": "MODIFY",
"old_path": "patches/react-native-keyboard-input+6.0.0.patch",
"new_path": "patches/react-native-keyboard-input+6.0.0.patch",
"diff": "@@ -57,6 +57,27 @@ index 59cae03..ec6f756 100644\n}\nregisterListener(props, nextProps) {\n+diff --git a/node_modules/react-native-keyboard-input/src/KeyboardAccessoryView.js b/node_modules/react-native-keyboard-input/src/KeyboardAccessoryView.js\n+index b91aa83..f403d38 100644\n+--- a/node_modules/react-native-keyboard-input/src/KeyboardAccessoryView.js\n++++ b/node_modules/react-native-keyboard-input/src/KeyboardAccessoryView.js\n+@@ -126,11 +126,15 @@ export default class KeyboardAccessoryView extends Component {\n+ }\n+\n+ render() {\n++ let onLayout = undefined;\n++ if (this.props.onHeightChanged) {\n++ onLayout = this.onContainerComponentHeightChanged;\n++ }\n+ return (\n+ <KeyboardTrackingView\n+ ref={r => this.trackingViewRef = r}\n+ style={styles.trackingToolbarContainer}\n+- onLayout={this.onContainerComponentHeightChanged}\n++ onLayout={onLayout}\n+ scrollBehavior={this.getIOSTrackingScrollBehavior()}\n+ revealKeyboardInteractive={this.props.revealKeyboardInteractive}\n+ manageScrollView={this.props.manageScrollView}\ndiff --git a/node_modules/react-native-keyboard-input/src/TextInputKeyboardMangerIOS.js b/node_modules/react-native-keyboard-input/src/TextInputKeyboardMangerIOS.js\nindex 20d61c9..13a6493 100644\n--- a/node_modules/react-native-keyboard-input/src/TextInputKeyboardMangerIOS.js\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Avoid onLayout in KeyboardAccessoryView if not needed |
129,187 | 15.05.2020 13:50:03 | 14,400 | f88965bde6a560f791e5bfdedc557bf68926b14f | [native] Disable react-native-screens for old Android 4.4 devices
To avoid stack overflow crashes... | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/root-navigator.react.js",
"new_path": "native/navigation/root-navigator.react.js",
"diff": "@@ -31,7 +31,15 @@ import ComposeSubthreadModal from '../chat/settings/compose-subthread-modal.reac\nimport RootRouter from './root-router';\nimport { RootNavigatorContext } from './root-navigator-context';\n+if (Platform.OS !== \"android\" || Platform.Version >= 21) {\n+ // Older Android devices get stack overflows when trying to draw deeply nested\n+ // view structures. We've tried to get our draw depth down as much as possible\n+ // without going into React Navigation internals or creating a separate render\n+ // path for these old Android devices. Because react-native-screens increases\n+ // the draw depth enough to cause crashes in some scenarios, we disable it\n+ // here for those devices\nenableScreens();\n+}\nfunction RootNavigator({\ninitialRouteName,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Disable react-native-screens for old Android 4.4 devices
To avoid stack overflow crashes... |
129,187 | 15.05.2020 13:51:29 | 14,400 | 2a72ac90906ecd33597b1eb20dc0a3ee4b55088f | [native] Fix rootContextPropType
Not sure why it was wrong... | [
{
"change_type": "MODIFY",
"old_path": "native/root-context.js",
"new_path": "native/root-context.js",
"diff": "@@ -39,7 +39,8 @@ function withRootContext<\n}\nconst rootContextPropType = PropTypes.shape({\n- detectUnsupervisedBackground: PropTypes.func.isRequired,\n+ detectUnsupervisedBackground: PropTypes.func,\n+ setNavStateInitialized: PropTypes.func.isRequired,\n});\nexport { RootContext, withRootContext, rootContextPropType };\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Fix rootContextPropType
Not sure why it was wrong... |
129,187 | 15.05.2020 14:42:16 | 14,400 | a3e48c81ae8d45896f31fc7009cf08018b84321b | [native] Fix keyboard flicker on ClearableTextInput send | [
{
"change_type": "MODIFY",
"old_path": "native/components/clearable-text-input.react.ios.js",
"new_path": "native/components/clearable-text-input.react.ios.js",
"diff": "@@ -21,6 +21,7 @@ class ClearableTextInput extends React.PureComponent<\npendingMessage: ?{| value: string, resolve: (value: string) => void |};\nlastKeyPressed: ?string;\nlastTextInputSent = -1;\n+ currentTextInput: ?TextInput;\nsendMessage() {\nif (this.pendingMessageSent) {\n@@ -91,10 +92,22 @@ class ClearableTextInput extends React.PureComponent<\nthis.sendMessage();\n};\n+ onOldInputFocus = () => {\n+ // It's possible for the user to press the old input after the new one\n+ // appears. We can prevent that with pointerEvents=\"none\", but that causes a\n+ // blur event when we set it, which makes the keyboard briefly pop down\n+ // before popping back up again when textInputRef is called below. Instead\n+ // we try to catch the focus event here and refocus the currentTextInput\n+ if (this.currentTextInput) {\n+ this.currentTextInput.focus();\n+ }\n+ };\n+\ntextInputRef = (textInput: ?TextInput) => {\nif (this.state.textInputKey > 0 && textInput) {\ntextInput.focus();\n}\n+ this.currentTextInput = textInput;\nthis.props.textInputRef(textInput);\n};\n@@ -121,7 +134,7 @@ class ClearableTextInput extends React.PureComponent<\nonChangeText={this.onOldInputChangeText}\nonKeyPress={this.onOldInputKeyPress}\nonBlur={this.onOldInputBlur}\n- pointerEvents=\"none\"\n+ onFocus={this.onOldInputFocus}\nkey={this.state.textInputKey - 1}\n/>,\n);\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Fix keyboard flicker on ClearableTextInput send |
129,187 | 16.05.2020 12:09:47 | 14,400 | 08dcfbb1a9999d12bf6fdeb35304df231e207b24 | [native] assertNavigationRouteNotLeafNode -> getStateFromNavigatorRoute | [
{
"change_type": "MODIFY",
"old_path": "native/chat/thread-screen-pruner.react.js",
"new_path": "native/chat/thread-screen-pruner.react.js",
"diff": "@@ -8,7 +8,7 @@ import { Alert } from 'react-native';\nimport { NavContext } from '../navigation/navigation-context';\nimport {\n- assertNavigationRouteNotLeafNode,\n+ getStateFromNavigatorRoute,\ngetThreadIDFromRoute,\n} from '../utils/navigation-utils';\nimport { useActiveThread } from '../navigation/nav-selectors';\n@@ -26,9 +26,9 @@ const ThreadScreenPruner = React.memo<{||}>(() => {\nreturn null;\n}\nconst { state } = navContext;\n- const appRoute = assertNavigationRouteNotLeafNode(state.routes[0]);\n- const tabRoute = assertNavigationRouteNotLeafNode(appRoute.state.routes[0]);\n- return assertNavigationRouteNotLeafNode(tabRoute.state.routes[1]);\n+ const appState = getStateFromNavigatorRoute(state.routes[0]);\n+ const tabState = getStateFromNavigatorRoute(appState.routes[0]);\n+ return getStateFromNavigatorRoute(tabState.routes[1]);\n}, [navContext]);\nconst inStackThreadIDs = React.useMemo(() => {\n@@ -36,7 +36,7 @@ const ThreadScreenPruner = React.memo<{||}>(() => {\nif (!chatRoute) {\nreturn threadIDs;\n}\n- for (let route of chatRoute.state.routes) {\n+ for (let route of chatRoute.routes) {\nconst threadID = getThreadIDFromRoute(route);\nif (threadID) {\nthreadIDs.add(threadID);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/nav-selectors.js",
"new_path": "native/navigation/nav-selectors.js",
"diff": "@@ -28,7 +28,7 @@ import {\nthreadRoutes,\n} from './route-names';\nimport {\n- assertNavigationRouteNotLeafNode,\n+ getStateFromNavigatorRoute,\ngetThreadIDFromRoute,\n} from '../utils/navigation-utils';\nimport { NavContext } from './navigation-context';\n@@ -81,13 +81,13 @@ const baseCreateActiveTabSelector = (routeName: string) =>\nif (currentRootSubroute.name !== AppRouteName) {\nreturn false;\n}\n- const appRoute = assertNavigationRouteNotLeafNode(currentRootSubroute);\n- const [firstAppSubroute] = appRoute.state.routes;\n+ const appState = getStateFromNavigatorRoute(currentRootSubroute);\n+ const [firstAppSubroute] = appState.routes;\nif (firstAppSubroute.name !== TabNavigatorRouteName) {\nreturn false;\n}\n- const tabRoute = assertNavigationRouteNotLeafNode(firstAppSubroute);\n- return tabRoute.state.routes[tabRoute.state.index].name === routeName;\n+ const tabState = getStateFromNavigatorRoute(firstAppSubroute);\n+ return tabState.routes[tabState.index].name === routeName;\n},\n);\nconst createActiveTabSelector: (\n@@ -108,9 +108,9 @@ const scrollBlockingChatModalsClosedSelector: (\nif (currentRootSubroute.name !== AppRouteName) {\nreturn true;\n}\n- const appRoute = assertNavigationRouteNotLeafNode(currentRootSubroute);\n- for (let i = appRoute.state.index; i >= 0; i--) {\n- const route = appRoute.state.routes[i];\n+ const appState = getStateFromNavigatorRoute(currentRootSubroute);\n+ for (let i = appState.index; i >= 0; i--) {\n+ const route = appState.routes[i];\nif (scrollBlockingChatModals.includes(route.name)) {\nreturn false;\n}\n@@ -132,11 +132,11 @@ function selectBackgroundIsDark(\n// we only use this selector for determining ActionResultModal appearance\nreturn false;\n}\n- const appRoute = assertNavigationRouteNotLeafNode(currentRootSubroute);\n- let appIndex = appRoute.state.index;\n- let currentAppSubroute = appRoute.state.routes[appIndex];\n+ const appState = getStateFromNavigatorRoute(currentRootSubroute);\n+ let appIndex = appState.index;\n+ let currentAppSubroute = appState.routes[appIndex];\nwhile (currentAppSubroute.name === ActionResultModalRouteName) {\n- currentAppSubroute = appRoute.state.routes[--appIndex];\n+ currentAppSubroute = appState.routes[--appIndex];\n}\nif (scrollBlockingChatModals.includes(currentAppSubroute.name)) {\n// All the scroll-blocking chat modals have a dark background\n@@ -163,18 +163,18 @@ function activeThread(\n}\ncurrentRootSubroute = navigationState.routes[--rootIndex];\n}\n- const appRoute = assertNavigationRouteNotLeafNode(currentRootSubroute);\n- const [firstAppSubroute] = appRoute.state.routes;\n+ const appState = getStateFromNavigatorRoute(currentRootSubroute);\n+ const [firstAppSubroute] = appState.routes;\nif (firstAppSubroute.name !== TabNavigatorRouteName) {\nreturn null;\n}\n- const tabRoute = assertNavigationRouteNotLeafNode(firstAppSubroute);\n- const currentTabSubroute = tabRoute.state.routes[tabRoute.state.index];\n+ const tabState = getStateFromNavigatorRoute(firstAppSubroute);\n+ const currentTabSubroute = tabState.routes[tabState.index];\nif (currentTabSubroute.name !== ChatRouteName) {\nreturn null;\n}\n- const chatRoute = assertNavigationRouteNotLeafNode(currentTabSubroute);\n- const currentChatSubroute = chatRoute.state.routes[chatRoute.state.index];\n+ const chatState = getStateFromNavigatorRoute(currentTabSubroute);\n+ const currentChatSubroute = chatState.routes[chatState.index];\nreturn getThreadIDFromRoute(currentChatSubroute, validRouteNames);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/utils/navigation-utils.js",
"new_path": "native/utils/navigation-utils.js",
"diff": "@@ -15,10 +15,14 @@ import {\nthreadRoutes,\n} from '../navigation/route-names';\n-function assertNavigationRouteNotLeafNode(\n+function getStateFromNavigatorRoute(\nroute: NavigationRoute,\n): NavigationStateRoute {\n- return route;\n+ invariant(\n+ route.state,\n+ `expecting NavigationRoute for ${route.key} to be NavigationState`,\n+ );\n+ return route.state;\n}\nfunction getThreadIDFromParams(params: ?NavigationParams): string {\n@@ -63,13 +67,12 @@ function getThreadIDFromRoute(\nreturn getThreadIDFromParams(route.params);\n}\n-function currentRouteRecurse(state: NavigationRoute): NavigationLeafRoute {\n- if (state.index || state.routes) {\n- const stateRoute = assertNavigationRouteNotLeafNode(state);\n- return currentRouteRecurse(stateRoute.routes[stateRoute.index]);\n- } else {\n- return state;\n+function currentRouteRecurse(route: NavigationRoute): NavigationLeafRoute {\n+ if (!route.state) {\n+ return route;\n}\n+ const state = getStateFromNavigatorRoute(route);\n+ return currentRouteRecurse(state.routes[state.index]);\n}\nfunction currentLeafRoute(state: NavigationState): NavigationLeafRoute {\n@@ -131,7 +134,7 @@ function removeScreensFromStack<S: NavigationState>(\n}\nexport {\n- assertNavigationRouteNotLeafNode,\n+ getStateFromNavigatorRoute,\ngetThreadIDFromParams,\ngetThreadIDFromRoute,\ncurrentLeafRoute,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] assertNavigationRouteNotLeafNode -> getStateFromNavigatorRoute |
129,187 | 17.05.2020 23:13:26 | 14,400 | b193af4ce415a458a31de72b3fa302d369aaef85 | [native] Animate TabBar for keyboard events on Android | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/tab-bar.react.js",
"new_path": "native/navigation/tab-bar.react.js",
"diff": "// @flow\n+import type { LayoutEvent } from '../types/react-native';\n+\nimport * as React from 'react';\n-import { Platform } from 'react-native';\n+import { Platform, View, StyleSheet } from 'react-native';\nimport { BottomTabBar } from '@react-navigation/bottom-tabs';\n+import Animated, { Easing } from 'react-native-reanimated';\n+\n+import { KeyboardContext } from '../keyboard/keyboard-state';\n-import {\n- type KeyboardState,\n- withKeyboardState,\n-} from '../keyboard/keyboard-state';\n+/* eslint-disable import/no-named-as-default-member */\n+const { Value, timing, interpolate } = Animated;\n+/* eslint-enable import/no-named-as-default-member */\n-type Props = {|\n- ...React.ElementConfig<typeof BottomTabBar>,\n- // withKeyboardState\n- keyboardState: ?KeyboardState,\n-|};\n+type Props = React.ElementConfig<typeof BottomTabBar>;\nfunction TabBar(props: Props) {\n- const { keyboardState, ...rest } = props;\n- if (\n- Platform.OS === 'android' &&\n- keyboardState &&\n- keyboardState.keyboardShowing\n- ) {\n- return null;\n+ const tabBarVisibleRef = new React.useRef();\n+ if (!tabBarVisibleRef.current) {\n+ tabBarVisibleRef.current = new Value(1);\n}\n- return <BottomTabBar {...rest} />;\n+ const tabBarVisible = tabBarVisibleRef.current;\n+\n+ const keyboardState = React.useContext(KeyboardContext);\n+ const keyboardShowing = keyboardState && keyboardState.keyboardShowing;\n+\n+ const animateTabBar = React.useCallback(\n+ toValue => timing(tabBarVisible, {\n+ toValue,\n+ duration: 200,\n+ easing: Easing.inOut(Easing.ease),\n+ }).start(),\n+ [tabBarVisible],\n+ );\n+\n+ const keyboardWasShowingRef = React.useRef(false);\n+ React.useEffect(() => {\n+ const keyboardWasShowing = keyboardWasShowingRef.current;\n+ if (keyboardShowing && !keyboardWasShowing) {\n+ animateTabBar(0);\n+ } else if (!keyboardShowing && keyboardWasShowing) {\n+ animateTabBar(1);\n+ }\n+ keyboardWasShowingRef.current = keyboardShowing;\n+ }, [keyboardShowing, animateTabBar]);\n+\n+ const [tabBarHeight, setTabBarHeight] = React.useState(0);\n+ const handleLayout = React.useCallback((e: LayoutEvent) => {\n+ const { height } = e.nativeEvent.layout;\n+ if (height) {\n+ setTabBarHeight(height);\n}\n+ }, [setTabBarHeight]);\n+\n+ const containerHeight = React.useMemo(() => interpolate(tabBarVisible, {\n+ inputRange: [0, 1],\n+ outputRange: [0, tabBarHeight],\n+ }), [tabBarVisible, tabBarHeight]);\n+ const containerStyle = React.useMemo(() => ({\n+ height: tabBarHeight ? containerHeight : undefined,\n+ ...styles.container,\n+ }), [tabBarHeight, containerHeight]);\n+\n+ if (Platform.OS !== 'android') {\n+ return (\n+ <View onLayout={handleLayout} style={styles.container}>\n+ <BottomTabBar {...props} />\n+ </View>\n+ );\n+ }\n+\n+ return (\n+ <Animated.View style={containerStyle}>\n+ <View onLayout={handleLayout} style={styles.tabBar}>\n+ <BottomTabBar {...props} />\n+ </View>\n+ </Animated.View>\n+ );\n+}\n+\n+const styles = StyleSheet.create({\n+ container: {\n+ left: 0,\n+ right: 0,\n+ bottom: 0,\n+ },\n+ tabBar: {\n+ position: 'absolute',\n+ left: 0,\n+ right: 0,\n+ top: 0,\n+ },\n+});\n-const WrappedTabBar = withKeyboardState(TabBar);\n-export default props => <WrappedTabBar {...props} />;\n+export default props => <TabBar {...props} />;\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Animate TabBar for keyboard events on Android |
129,187 | 18.05.2020 10:58:09 | 14,400 | c7aa1509e660b005a2a92c0ce46f0cbdf5b53526 | [native] Keep tabBarHeight in Redux | [
{
"change_type": "MODIFY",
"old_path": "native/calendar/calendar.react.js",
"new_path": "native/calendar/calendar.react.js",
"diff": "@@ -69,7 +69,6 @@ import { Entry, InternalEntry, entryStyles } from './entry.react';\nimport {\ndimensionsSelector,\ncontentVerticalOffsetSelector,\n- tabBarSize,\n} from '../selectors/dimension-selectors';\nimport { calendarListData } from '../selectors/calendar-selectors';\nimport {\n@@ -138,6 +137,7 @@ type Props = {\nconnectionStatus: ConnectionStatus,\ncolors: Colors,\nstyles: typeof styles,\n+ tabBarHeight: number,\n// Redux dispatch functions\ndispatchActionPromise: DispatchActionPromise,\n// async functions that hit server APIs\n@@ -194,6 +194,7 @@ class Calendar extends React.PureComponent<Props, State> {\nconnectionStatus: connectionStatusPropType.isRequired,\ncolors: colorsPropType.isRequired,\nstyles: PropTypes.objectOf(PropTypes.object).isRequired,\n+ tabBarHeight: PropTypes.number.isRequired,\ndispatchActionPromise: PropTypes.func.isRequired,\nupdateCalendarQuery: PropTypes.func.isRequired,\n};\n@@ -769,8 +770,9 @@ class Calendar extends React.PureComponent<Props, State> {\nconst {\ndimensions: { height: windowHeight },\ncontentVerticalOffset,\n+ tabBarHeight,\n} = this.props;\n- return windowHeight - contentVerticalOffset - tabBarSize;\n+ return windowHeight - contentVerticalOffset - tabBarHeight;\n}\ninitialScrollIndex(data: $ReadOnlyArray<CalendarItemWithHeight>) {\n@@ -899,7 +901,8 @@ class Calendar extends React.PureComponent<Props, State> {\nconst itemEnd = itemStart + itemHeight + entryAdditionalActiveHeight;\n// flatListHeight() factors in the size of the tab bar,\n// but it is hidden by the keyboard since it is at the bottom\n- const visibleHeight = this.flatListHeight() - keyboardHeight + tabBarSize;\n+ const visibleHeight =\n+ this.flatListHeight() - keyboardHeight + this.props.tabBarHeight;\nif (\nthis.currentScrollPosition !== undefined &&\nthis.currentScrollPosition !== null &&\n@@ -1133,6 +1136,7 @@ export default connectNav((context: ?NavContextType) => ({\nconnectionStatus: state.connection.status,\ncolors: colorsSelector(state),\nstyles: stylesSelector(state),\n+ tabBarHeight: state.dimensions.tabBarHeight,\n}),\n{ updateCalendarQuery },\n)(Calendar),\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/tab-bar.react.js",
"new_path": "native/navigation/tab-bar.react.js",
"diff": "@@ -6,8 +6,11 @@ import * as React from 'react';\nimport { Platform, View, StyleSheet } from 'react-native';\nimport { BottomTabBar } from '@react-navigation/bottom-tabs';\nimport Animated, { Easing } from 'react-native-reanimated';\n+import { useDispatch, useSelector } from 'react-redux';\n+import { useSafeArea } from 'react-native-safe-area-context';\nimport { KeyboardContext } from '../keyboard/keyboard-state';\n+import { updateDimensionsActiveType } from '../redux/action-types';\n/* eslint-disable import/no-named-as-default-member */\nconst { Value, timing, interpolate } = Animated;\n@@ -44,13 +47,33 @@ function TabBar(props: Props) {\nkeyboardWasShowingRef.current = keyboardShowing;\n}, [keyboardShowing, animateTabBar]);\n+ const reduxTabBarHeight = useSelector(state => state.dimensions.tabBarHeight);\n+ const dispatch = useDispatch();\n+ const setReduxTabBarHeight = React.useCallback(height => {\n+ if (height === reduxTabBarHeight) {\n+ return;\n+ }\n+ dispatch({\n+ type: updateDimensionsActiveType,\n+ payload: { tabBarHeight: height },\n+ });\n+ }, [reduxTabBarHeight, dispatch]);\n+\nconst [tabBarHeight, setTabBarHeight] = React.useState(0);\n+ const insets = useSafeArea();\nconst handleLayout = React.useCallback((e: LayoutEvent) => {\n- const { height } = e.nativeEvent.layout;\n- if (height) {\n- setTabBarHeight(height);\n+ const rawHeight = Math.round(e.nativeEvent.layout.height);\n+ if (rawHeight > 100 || rawHeight <= 0) {\n+ return;\n+ }\n+ if (Platform.OS === 'android') {\n+ setTabBarHeight(rawHeight);\n+ }\n+ const height = rawHeight - insets.bottom;\n+ if (height > 0) {\n+ setReduxTabBarHeight(height);\n}\n- }, [setTabBarHeight]);\n+ }, [setTabBarHeight, setReduxTabBarHeight, insets]);\nconst containerHeight = React.useMemo(() => interpolate(tabBarVisible, {\ninputRange: [0, 1],\n"
},
{
"change_type": "MODIFY",
"old_path": "native/redux/dimensions-updater.react.js",
"new_path": "native/redux/dimensions-updater.react.js",
"diff": "@@ -38,7 +38,7 @@ class DimensionsUpdater extends React.PureComponent<Props> {\nthis.props.dimensions.width !== prevProps.dimensions.width\n) {\n// Most of the time, this is triggered as a result of an action dispatched\n- // by the handler attached above, so the onDimensionsChnage call should be\n+ // by the handler attached above, so the onDimensionsChange call should be\n// a no-op. This conditional is here to correct Redux state when it is\n// imported from another device context.\nthis.onDimensionsChange({ window: NativeDimensions.get('window') });\n"
},
{
"change_type": "MODIFY",
"old_path": "native/redux/redux-setup.js",
"new_path": "native/redux/redux-setup.js",
"diff": "@@ -83,6 +83,7 @@ import {\nimport reactotron from '../reactotron';\nimport reduceDrafts from '../reducers/draft-reducer';\nimport { getGlobalNavContext } from '../navigation/icky-global';\n+import { defaultTabBarHeight } from '../selectors/dimension-selectors';\nexport type AppState = {|\nnavInfo: NavInfo,\n@@ -155,7 +156,7 @@ const defaultState = ({\nnextLocalID: 0,\nqueuedReports: [],\n_persist: null,\n- dimensions: { height, width },\n+ dimensions: { height, width, tabBarHeight: defaultTabBarHeight },\nconnectivity: defaultConnectivityInfo,\nglobalThemeInfo: defaultGlobalThemeInfo,\ndeviceCameraInfo: defaultDeviceCameraInfo,\n@@ -231,7 +232,10 @@ function reducer(state: AppState = defaultState, action: *) {\n} else if (action.type === updateDimensionsActiveType) {\nreturn {\n...state,\n- dimensions: action.payload,\n+ dimensions: {\n+ ...state.dimensions,\n+ ...action.payload,\n+ },\n};\n} else if (action.type === updateConnectivityActiveType) {\nreturn {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/selectors/dimension-selectors.js",
"new_path": "native/selectors/dimension-selectors.js",
"diff": "@@ -55,11 +55,11 @@ const contentVerticalOffsetSelector: (\n},\n);\n-const tabBarSize = Platform.OS === 'android' ? 50 : 49;\n+const defaultTabBarHeight = 50;\nexport {\ncontentBottomOffset,\ndimensionsSelector,\ncontentVerticalOffsetSelector,\n- tabBarSize,\n+ defaultTabBarHeight,\n};\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Keep tabBarHeight in Redux |
129,187 | 18.05.2020 14:17:37 | 14,400 | 313eb1c3ad7bc0ac966a6d24410e5d407ab1fffe | [native] Fix iOS build
Not sure what broke it, but this was the issue: | [
{
"change_type": "MODIFY",
"old_path": "native/ios/Podfile",
"new_path": "native/ios/Podfile",
"diff": "@@ -46,3 +46,11 @@ target 'SquadCal' do\nuse_native_modules!\nuse_unimodules!(modules_paths: ['../..'])\nend\n+\n+post_install do |installer|\n+ installer.pods_project.targets.each do |target|\n+ target.build_configurations.each do |config|\n+ config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '10.0'\n+ end\n+ end\n+end\n"
},
{
"change_type": "MODIFY",
"old_path": "native/ios/Podfile.lock",
"new_path": "native/ios/Podfile.lock",
"diff": "@@ -671,6 +671,6 @@ SPEC CHECKSUMS:\nUMTaskManagerInterface: cb890c79c63885504ddc0efd7a7d01481760aca2\nYoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b\n-PODFILE CHECKSUM: 0a506b9da6311d0bbf837ed1c7ca0e7c5574c0cb\n+PODFILE CHECKSUM: 086575e6e9bd8fb89cc0b7b7ed0230aaa903e0de\nCOCOAPODS: 1.9.1\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Fix iOS build
Not sure what broke it, but this was the issue: https://github.com/tanersener/react-native-ffmpeg/issues/148 |
129,187 | 18.05.2020 15:22:25 | 14,400 | 34c8a44c0f167ee56cc3cf52a2f0d1fecd64ab94 | [native] Fix up DisconnectedBar
It's now a hook and uses `Reanimated` instead of `LayoutAnimation`. I sadly had to add a custom patch to `@react-navigation/stack` to prevent it from absolutely positioning the header, otherwise the animation looks pretty ugly... | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/disconnected-bar.react.js",
"new_path": "native/navigation/disconnected-bar.react.js",
"diff": "// @flow\n-import type { AppState } from '../redux/redux-setup';\n-\nimport * as React from 'react';\n-import { View, Text, StyleSheet, LayoutAnimation } from 'react-native';\n-import PropTypes from 'prop-types';\n+import { Text, StyleSheet, Platform } from 'react-native';\n+import { useSelector } from 'react-redux';\n+import Animated, { Easing } from 'react-native-reanimated';\n+\n+/* eslint-disable import/no-named-as-default-member */\n+const { Value, timing, interpolate } = Animated;\n+/* eslint-enable import/no-named-as-default-member */\n-import { connect } from 'lib/utils/redux-utils';\n+const expandedHeight = Platform.select({\n+ android: 29.5,\n+ default: 27,\n+});\ntype Props = {|\nvisible: boolean,\n- // Redux state\n- showDisconnectedBar: boolean,\n|};\n-class DisconnectedBar extends React.PureComponent<Props> {\n- static propTypes = {\n- visible: PropTypes.bool.isRequired,\n- showDisconnectedBar: PropTypes.bool.isRequired,\n- };\n-\n- componentDidUpdate(prevProps: Props) {\n- const { visible, showDisconnectedBar } = this.props;\n- if (visible && showDisconnectedBar !== prevProps.showDisconnectedBar) {\n- LayoutAnimation.easeInEaseOut();\n- }\n+function DisconnectedBar(props: Props) {\n+ const showingRef = new React.useRef();\n+ if (!showingRef.current) {\n+ showingRef.current = new Value(0);\n}\n+ const showing = showingRef.current;\n- render() {\n- const disconnectedBarStyles = [styles.disconnectedBar];\n- let text;\n- if (this.props.showDisconnectedBar) {\n- text = <Text style={styles.disconnectedText}>DISCONNECTED</Text>;\n- } else {\n- disconnectedBarStyles.push(styles.hiddenDisconnectedBar);\n+ const { visible } = props;\n+ const changeShowing = React.useCallback(toValue => {\n+ if (!visible) {\n+ showing.setValue(toValue);\n+ return;\n}\n- return <View style={disconnectedBarStyles}>{text}</View>;\n+ timing(showing, {\n+ toValue,\n+ duration: 200,\n+ easing: Easing.inOut(Easing.ease),\n+ }).start();\n+ }, [visible, showing]);\n+\n+ const shouldShowDisconnectedBar = useSelector(\n+ state => state.connection.showDisconnectedBar,\n+ );\n+ const prevShowDisconnectedBar = React.useRef();\n+ React.useEffect(() => {\n+ const wasShowing = prevShowDisconnectedBar.current;\n+ if (shouldShowDisconnectedBar && !wasShowing) {\n+ changeShowing(1);\n+ } else if (!shouldShowDisconnectedBar && wasShowing) {\n+ changeShowing(0);\n}\n+ prevShowDisconnectedBar.current = shouldShowDisconnectedBar;\n+ }, [shouldShowDisconnectedBar, changeShowing]);\n+\n+ const height = React.useMemo(() => interpolate(showing, {\n+ inputRange: [0, 1],\n+ outputRange: [0, expandedHeight],\n+ }), [showing]);\n+ const containerStyle = React.useMemo(() => ({\n+ height,\n+ ...styles.container,\n+ }), [height]);\n+\n+ return (\n+ <Animated.View style={containerStyle} pointerEvents=\"none\">\n+ <Text style={styles.text} numberOfLines={1}>DISCONNECTED</Text>\n+ </Animated.View>\n+ );\n}\nconst styles = StyleSheet.create({\n- disconnectedBar: {\n+ container: {\nbackgroundColor: '#CC0000',\n- padding: 5,\n+ overflow: 'hidden',\n},\n- disconnectedText: {\n+ text: {\ncolor: 'white',\nfontSize: 14,\ntextAlign: 'center',\n- },\n- hiddenDisconnectedBar: {\n- height: 0,\n- padding: 0,\n+ padding: 5,\n},\n});\n-export default connect((state: AppState) => ({\n- showDisconnectedBar: state.connection.showDisconnectedBar,\n-}))(DisconnectedBar);\n+export default DisconnectedBar;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/header.react.js",
"new_path": "native/navigation/header.react.js",
"diff": "@@ -12,9 +12,9 @@ type Props = {|\nexport default function CustomHeader(props: Props) {\nconst { activeTab, ...rest } = props;\nreturn (\n- <View>\n+ <>\n<Header {...rest} />\n<DisconnectedBar visible={activeTab} />\n- </View>\n+ </>\n);\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "patches/@react-navigation+stack+5.3.1.patch",
"diff": "+diff --git a/node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx b/node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx\n+index 2665164..80c0868 100644\n+--- a/node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx\n++++ b/node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx\n+@@ -189,7 +189,7 @@ function CardContainer({\n+ pageOverflowEnabled={headerMode === 'screen' && mode === 'card'}\n+ containerStyle={\n+ headerMode === 'float' && !headerTransparent && headerShown !== false\n+- ? { marginTop: headerHeight }\n++ ? null\n+ : null\n+ }\n+ contentStyle={[{ backgroundColor: colors.background }, cardStyle]}\n+diff --git a/node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx b/node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx\n+index b47a50d..6226379 100755\n+--- a/node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx\n++++ b/node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx\n+@@ -385,6 +385,26 @@ export default class CardStack extends React.Component<Props, State> {\n+\n+ return (\n+ <React.Fragment>\n++ {headerMode === 'float'\n++ ? renderHeader({\n++ mode: 'float',\n++ layout,\n++ insets: { top, right, bottom, left },\n++ scenes,\n++ getPreviousRoute,\n++ getFocusedRoute: this.getFocusedRoute,\n++ onContentHeightChange: this.handleHeaderLayout,\n++ gestureDirection:\n++ focusedOptions.gestureDirection !== undefined\n++ ? focusedOptions.gestureDirection\n++ : defaultTransitionPreset.gestureDirection,\n++ styleInterpolator:\n++ focusedOptions.headerStyleInterpolator !== undefined\n++ ? focusedOptions.headerStyleInterpolator\n++ : defaultTransitionPreset.headerStyleInterpolator,\n++ style: styles.floating,\n++ })\n++ : null}\n+ <MaybeScreenContainer\n+ enabled={isScreensEnabled}\n+ style={styles.container}\n+@@ -537,26 +557,6 @@ export default class CardStack extends React.Component<Props, State> {\n+ );\n+ })}\n+ </MaybeScreenContainer>\n+- {headerMode === 'float'\n+- ? renderHeader({\n+- mode: 'float',\n+- layout,\n+- insets: { top, right, bottom, left },\n+- scenes,\n+- getPreviousRoute,\n+- getFocusedRoute: this.getFocusedRoute,\n+- onContentHeightChange: this.handleHeaderLayout,\n+- gestureDirection:\n+- focusedOptions.gestureDirection !== undefined\n+- ? focusedOptions.gestureDirection\n+- : defaultTransitionPreset.gestureDirection,\n+- styleInterpolator:\n+- focusedOptions.headerStyleInterpolator !== undefined\n+- ? focusedOptions.headerStyleInterpolator\n+- : defaultTransitionPreset.headerStyleInterpolator,\n+- style: styles.floating,\n+- })\n+- : null}\n+ </React.Fragment>\n+ );\n+ }\n+@@ -567,7 +567,6 @@ const styles = StyleSheet.create({\n+ flex: 1,\n+ },\n+ floating: {\n+- position: 'absolute',\n+ top: 0,\n+ left: 0,\n+ right: 0,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Fix up DisconnectedBar
It's now a hook and uses `Reanimated` instead of `LayoutAnimation`. I sadly had to add a custom patch to `@react-navigation/stack` to prevent it from absolutely positioning the header, otherwise the animation looks pretty ugly... |
129,187 | 18.05.2020 16:28:02 | 14,400 | 63cd9fdb26211225653a3371088f3989accd18db | Hijack NavigationBuilderContext so we can track nav actions | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/root-navigator.react.js",
"new_path": "native/navigation/root-navigator.react.js",
"diff": "@@ -8,6 +8,8 @@ import {\nuseNavigationBuilder,\n} from '@react-navigation/native';\nimport { StackView, TransitionPresets } from '@react-navigation/stack';\n+import NavigationBuilderContext from '@react-navigation/core/src/NavigationBuilderContext';\n+import invariant from 'invariant';\nimport {\nLoggedOutModalRouteName,\n@@ -30,6 +32,7 @@ import ColorPickerModal from '../chat/settings/color-picker-modal.react';\nimport ComposeSubthreadModal from '../chat/settings/compose-subthread-modal.react';\nimport RootRouter from './root-router';\nimport { RootNavigatorContext } from './root-navigator-context';\n+import { RootContext } from '../root-context';\nif (Platform.OS !== \"android\" || Platform.Version >= 21) {\n// Older Android devices get stack overflows when trying to draw deeply nested\n@@ -114,7 +117,35 @@ const disableGesturesScreenOptions = {\nconst modalOverlayScreenOptions = {\ncardOverlayEnabled: true,\n};\n-export default () => (\n+export default () => {\n+ const builderContext = React.useContext(NavigationBuilderContext);\n+ invariant(\n+ builderContext && builderContext.trackAction,\n+ 'trackAction should be set in NavigationBuilderContext',\n+ );\n+ const baseTrackAction = builderContext.trackAction;\n+\n+ const rootContext = React.useContext(RootContext);\n+ invariant(\n+ rootContext && rootContext.onNavAction,\n+ 'onNavAction should be set in RootContext',\n+ );\n+ const { onNavAction } = rootContext;\n+\n+ const replacedTrackAction = React.useCallback(\n+ action => {\n+ onNavAction(action);\n+ return baseTrackAction(action);\n+ },\n+ [onNavAction, baseTrackAction],\n+ );\n+ const replacedBuilderContext = React.useMemo(() => ({\n+ ...builderContext,\n+ trackAction: replacedTrackAction,\n+ }), [builderContext, replacedTrackAction]);\n+\n+ return (\n+ <NavigationBuilderContext.Provider value={replacedBuilderContext}>\n<Root.Navigator\nmode=\"modal\"\nheaderMode=\"none\"\n@@ -159,4 +190,6 @@ export default () => (\noptions={modalOverlayScreenOptions}\n/>\n</Root.Navigator>\n+ </NavigationBuilderContext.Provider>\n);\n+};\n"
},
{
"change_type": "MODIFY",
"old_path": "native/root-context.js",
"new_path": "native/root-context.js",
"diff": "// @flow\n+import type { NavigationAction } from 'react-navigation';\n+\nimport * as React from 'react';\nimport hoistNonReactStatics from 'hoist-non-react-statics';\nimport PropTypes from 'prop-types';\n@@ -7,6 +9,7 @@ import PropTypes from 'prop-types';\nexport type RootContextType = {|\ndetectUnsupervisedBackground?: ?(alreadyClosed: boolean) => boolean,\nsetNavStateInitialized: () => void,\n+ onNavAction: (action: NavigationAction | string) => void,\n|};\nconst RootContext = React.createContext<?RootContextType>(null);\n@@ -41,6 +44,7 @@ function withRootContext<\nconst rootContextPropType = PropTypes.shape({\ndetectUnsupervisedBackground: PropTypes.func,\nsetNavStateInitialized: PropTypes.func.isRequired,\n+ onNavAction: PropTypes.func.isRequired,\n});\nexport { RootContext, withRootContext, rootContextPropType };\n"
},
{
"change_type": "MODIFY",
"old_path": "native/root.react.js",
"new_path": "native/root.react.js",
"diff": "import { type GlobalTheme, globalThemePropType } from './types/themes';\nimport type { AppState } from './redux/redux-setup';\nimport type { NavAction } from './navigation/navigation-context';\n-import type { NavigationState } from 'react-navigation';\n+import type { NavigationState, NavigationAction } from 'react-navigation';\nimport * as React from 'react';\nimport { Provider } from 'react-redux';\n@@ -65,16 +65,19 @@ class Root extends React.PureComponent<Props, State> {\nstatic propTypes = {\nactiveTheme: globalThemePropType,\n};\n-\nnavDispatch: ?(action: NavAction) => boolean;\nnavState: ?NavigationState;\nnavStateInitialized = false;\n+ queuedActions = [];\nconstructor(props: Props) {\nsuper(props);\nthis.state = {\nnavContext: null,\n- rootContext: { setNavStateInitialized: this.setNavStateInitialized },\n+ rootContext: {\n+ setNavStateInitialized: this.setNavStateInitialized,\n+ onNavAction: this.onNavAction,\n+ },\ninitialState: null,\n};\n}\n@@ -101,6 +104,12 @@ class Root extends React.PureComponent<Props, State> {\n}\nthis.navState = initialState;\nthis.setNavContext();\n+ actionLogger.addOtherAction(\n+ 'navState',\n+ 'NAV/@@INIT',\n+ null,\n+ initialState,\n+ );\nthis.setState({ initialState });\n};\n@@ -173,8 +182,19 @@ class Root extends React.PureComponent<Props, State> {\nonNavigationStateChange = (state: ?NavigationState) => {\ninvariant(state, 'nav state should be non-null');\n+ const prevState = this.navState;\nthis.navState = state;\nthis.setNavContext();\n+\n+ const { queuedActions } = this;\n+ this.queuedActions = [];\n+ if (queuedActions.length === 0) {\n+ queuedActions.push('NAV/@@UNKNOWN');\n+ }\n+ for (let action of queuedActions) {\n+ actionLogger.addOtherAction('navState', action, prevState, state);\n+ }\n+\nif (__DEV__) {\nthis.persistNavigationState(state);\n}\n@@ -207,6 +227,23 @@ class Root extends React.PureComponent<Props, State> {\nthis.setNavContext();\n};\n+ onNavAction = (action: NavigationAction | string) => {\n+ if (typeof action === 'string') {\n+ this.queuedActions.push(`NAV/${action}`);\n+ } else if (\n+ action &&\n+ typeof action === 'object' &&\n+ typeof action.type === 'string'\n+ ) {\n+ this.queuedActions.push({\n+ ...action,\n+ type: `NAV/${action.type}`,\n+ });\n+ } else {\n+ this.queuedActions.push(action);\n+ }\n+ };\n+\npersistNavigationState = async (state: NavigationState) => {\ntry {\nawait AsyncStorage.setItem(\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/responders/report-responders.js",
"new_path": "server/src/responders/report-responders.js",
"diff": "@@ -103,7 +103,7 @@ const reportCreationRequestInputValidator = t.union([\n),\npreloadedState: t.Object,\ncurrentState: t.Object,\n- actions: t.list(t.Object),\n+ actions: t.list(t.union([t.Object, t.String])),\n}),\nthreadInconsistencyReportCreationRequest,\nentryInconsistencyReportCreationRquest,\n@@ -148,7 +148,7 @@ const reportMultiCreationRequestInputValidator = tShape({\n),\npreloadedState: t.Object,\ncurrentState: t.Object,\n- actions: t.list(t.Object),\n+ actions: t.list(t.union([t.Object, t.String])),\n}),\nthreadInconsistencyReportCreationRequest,\nentryInconsistencyReportCreationRquest,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Hijack NavigationBuilderContext so we can track nav actions |
129,187 | 18.05.2020 16:56:36 | 14,400 | 9a5a4a6ea9831a4c21ea0c510e5d75f41c4b56ff | [native] Fix up ModalPruner's collectDependencyInfo for React Nav 5 | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/modal-pruner.react.js",
"new_path": "native/navigation/modal-pruner.react.js",
"diff": "@@ -23,8 +23,20 @@ function collectDependencyInfo(\ndependencyMap?: Map<string, DependencyInfo> = new Map(),\nparentRouteName?: ?string,\n): Map<string, DependencyInfo> {\n- if (route.key && typeof route.key === 'string') {\n- const key = route.key;\n+ let state, routeName;\n+ if (!route.name) {\n+ state = route;\n+ } else if (route.state) {\n+ ({ state, name: routeName } = route);\n+ }\n+ if (state) {\n+ state.routes.forEach(\n+ child => collectDependencyInfo(child, dependencyMap, routeName),\n+ );\n+ return dependencyMap;\n+ }\n+\n+ const { key } = route;\nconst presenter =\nroute.params && route.params.presentedFrom\n? route.params.presentedFrom\n@@ -49,6 +61,7 @@ function collectDependencyInfo(\npresenterInfo.presenting.push(key);\n}\n}\n+\nconst existingInfo = dependencyMap.get(key);\nconst presenting = existingInfo ? existingInfo.presenting : [];\ndependencyMap.set(key, {\n@@ -57,6 +70,7 @@ function collectDependencyInfo(\npresenting,\nparentRouteName,\n});\n+\nif (status === 'resolved') {\nconst toResolve = [...presenting];\nwhile (toResolve.length > 0) {\n@@ -67,16 +81,7 @@ function collectDependencyInfo(\ntoResolve.push(...dependencyInfo.presenting);\n}\n}\n- }\n- const routeName =\n- route.name && typeof route.name === 'string'\n- ? route.name\n- : undefined;\n- if (route.state && route.state.routes) {\n- route.state.routes.forEach(child =>\n- collectDependencyInfo(child, dependencyMap, routeName),\n- );\n- }\n+\nreturn dependencyMap;\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Fix up ModalPruner's collectDependencyInfo for React Nav 5 |
129,187 | 18.05.2020 21:30:38 | 14,400 | cee10df606df2dea79e35350ca48d12c7cf1b43c | [native] Fix useNavigationBuilder to be able to handle updates on stale routes | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/root-router.js",
"new_path": "native/navigation/root-router.js",
"diff": "@@ -17,12 +17,6 @@ import {\n} from './action-types';\nfunction resetState(newPartialRoute, oldRoute) {\n- if (oldRoute.state && oldRoute.state.stale) {\n- // If React Navigation hasn't rehydrated the state for this navigator yet,\n- // we can assume that it matches the default state. By keeping the old state\n- // we prevent React Navigation from assigning a new key\n- return oldRoute;\n- }\nconst newRoute = { ...oldRoute, ...newPartialRoute };\nif (!newRoute.state) {\nreturn newRoute;\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "patches/@react-navigation+core+5.5.2.patch",
"diff": "+diff --git a/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx b/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx\n+index 0acdc81..7676284 100644\n+--- a/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx\n++++ b/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx\n+@@ -295,10 +295,7 @@ export default function useNavigationBuilder<\n+ );\n+ }\n+ }\n+-\n+- React.useEffect(() => {\n+- previousStateRef.current = currentState;\n+- }, [currentState]);\n++ previousStateRef.current = currentState;\n+\n+ let state =\n+ // If the state isn't initialized, or stale, use the state we initialized instead\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Fix useNavigationBuilder to be able to handle updates on stale routes |
129,187 | 19.05.2020 15:54:57 | 14,400 | b7699983badfa73b6ebe79055cb25d73bc958788 | [native] Update relative float header patch | [
{
"change_type": "MODIFY",
"old_path": "patches/@react-navigation+stack+5.3.1.patch",
"new_path": "patches/@react-navigation+stack+5.3.1.patch",
"diff": "diff --git a/node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx b/node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx\n-index 2665164..80c0868 100644\n+index 2665164..6fd10f5 100644\n--- a/node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx\n+++ b/node_modules/@react-navigation/stack/src/views/Stack/CardContainer.tsx\n-@@ -189,7 +189,7 @@ function CardContainer({\n+@@ -55,6 +55,7 @@ type Props = TransitionPreset & {\n+ headerMode: StackHeaderMode;\n+ headerShown?: boolean;\n+ headerTransparent?: boolean;\n++ absoluteFloatHeader: boolean;\n+ headerHeight: number;\n+ onHeaderHeightChange: (props: {\n+ route: Route<string>;\n+@@ -85,6 +86,7 @@ function CardContainer({\n+ headerShown,\n+ headerStyleInterpolator,\n+ headerTransparent,\n++ absoluteFloatHeader,\n+ headerHeight,\n+ onHeaderHeightChange,\n+ index,\n+@@ -188,7 +190,7 @@ function CardContainer({\n+ pointerEvents={active ? 'box-none' : pointerEvents}\npageOverflowEnabled={headerMode === 'screen' && mode === 'card'}\ncontainerStyle={\n- headerMode === 'float' && !headerTransparent && headerShown !== false\n-- ? { marginTop: headerHeight }\n-+ ? null\n+- headerMode === 'float' && !headerTransparent && headerShown !== false\n++ absoluteFloatHeader && !headerTransparent && headerShown !== false\n+ ? { marginTop: headerHeight }\n: null\n}\n- contentStyle={[{ backgroundColor: colors.background }, cardStyle]}\ndiff --git a/node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx b/node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx\n-index b47a50d..6226379 100755\n+index b47a50d..eef1d6c 100755\n--- a/node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx\n+++ b/node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx\n-@@ -385,6 +385,26 @@ export default class CardStack extends React.Component<Props, State> {\n+@@ -42,6 +42,7 @@ type Props = {\n+ routes: Route<string>[];\n+ openingRouteKeys: string[];\n+ closingRouteKeys: string[];\n++ replacingRouteKeys: string[];\n+ onOpenRoute: (props: { route: Route<string> }) => void;\n+ onCloseRoute: (props: { route: Route<string> }) => void;\n+ getPreviousRoute: (props: {\n+@@ -299,7 +300,7 @@ export default class CardStack extends React.Component<Props, State> {\n+ props.insets,\n+ state.descriptors,\n+ layout,\n+- {}\n++ state.headerHeights\n+ ),\n+ };\n+ });\n+@@ -334,6 +335,49 @@ export default class CardStack extends React.Component<Props, State> {\n+ return state.routes[state.index];\n+ };\n- return (\n- <React.Fragment>\n-+ {headerMode === 'float'\n-+ ? renderHeader({\n++ private getSomeFloatHeaderNeedsAbsolutePositioning() {\n++ if (this.props.headerMode !== 'float') {\n++ return false;\n++ }\n++\n++ const {\n++ closingRouteKeys,\n++ openingRouteKeys,\n++ replacingRouteKeys,\n++ } = this.props;\n++ const focusedRoute = this.getFocusedRoute();\n++ const visibleKeys = new Set([\n++ ...closingRouteKeys,\n++ ...replacingRouteKeys,\n++ focusedRoute.key,\n++ ]);\n++ if (openingRouteKeys.length > 0) {\n++ for (let scene of this.state.scenes) {\n++ const { route } = scene;\n++ if (!openingRouteKeys.includes(route.key)) {\n++ continue;\n++ }\n++ const prevRoute = this.props.getPreviousRoute({ route });\n++ if (prevRoute) {\n++ visibleKeys.add(prevRoute.key);\n++ }\n++ }\n++ }\n++\n++ for (let scene of this.state.scenes) {\n++ const { route, descriptor } = scene;\n++ if (!visibleKeys.has(route.key)) {\n++ continue;\n++ }\n++ const options = descriptor ? descriptor.options : {};\n++ const { headerTransparent, headerShown } = options;\n++ if (headerTransparent || headerShown === false) {\n++ return true;\n++ }\n++ }\n++ return false;\n++ }\n++\n+ render() {\n+ const {\n+ mode,\n+@@ -361,6 +405,7 @@ export default class CardStack extends React.Component<Props, State> {\n+ const focusedRoute = state.routes[state.index];\n+ const focusedDescriptor = descriptors[focusedRoute.key];\n+ const focusedOptions = focusedDescriptor ? focusedDescriptor.options : {};\n++ const absoluteFloatHeader = this.getSomeFloatHeaderNeedsAbsolutePositioning();\n+\n+ let defaultTransitionPreset =\n+ mode === 'modal' ? ModalTransition : DefaultTransition;\n+@@ -383,8 +428,31 @@ export default class CardStack extends React.Component<Props, State> {\n+ // For modals, usually we want the screen underneath to be visible, so also disable it there\n+ const isScreensEnabled = Platform.OS !== 'ios' && mode !== 'modal';\n+\n++ let floatingHeader;\n++ if (headerMode === 'float') {\n++ floatingHeader = renderHeader({\n+ mode: 'float',\n+ layout,\n+ insets: { top, right, bottom, left },\n@@ -36,13 +128,25 @@ index b47a50d..6226379 100755\n+ focusedOptions.headerStyleInterpolator !== undefined\n+ ? focusedOptions.headerStyleInterpolator\n+ : defaultTransitionPreset.headerStyleInterpolator,\n-+ style: styles.floating,\n-+ })\n-+ : null}\n++ style: absoluteFloatHeader ? styles.floating : undefined,\n++ });\n++ }\n++\n+ return (\n+ <React.Fragment>\n++ {absoluteFloatHeader ? null : floatingHeader}\n<MaybeScreenContainer\nenabled={isScreensEnabled}\nstyle={styles.container}\n-@@ -537,26 +557,6 @@ export default class CardStack extends React.Component<Props, State> {\n+@@ -523,6 +591,7 @@ export default class CardStack extends React.Component<Props, State> {\n+ headerMode={headerMode}\n+ headerShown={headerShown}\n+ headerTransparent={headerTransparent}\n++ absoluteFloatHeader={absoluteFloatHeader}\n+ renderHeader={renderHeader}\n+ renderScene={renderScene}\n+ onOpenRoute={onOpenRoute}\n+@@ -537,26 +606,7 @@ export default class CardStack extends React.Component<Props, State> {\n);\n})}\n</MaybeScreenContainer>\n@@ -66,14 +170,27 @@ index b47a50d..6226379 100755\n- style: styles.floating,\n- })\n- : null}\n++ {absoluteFloatHeader ? floatingHeader : null}\n</React.Fragment>\n);\n}\n-@@ -567,7 +567,6 @@ const styles = StyleSheet.create({\n- flex: 1,\n- },\n- floating: {\n-- position: 'absolute',\n- top: 0,\n- left: 0,\n- right: 0,\n+diff --git a/node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx b/node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx\n+index 1f73567..300d826 100644\n+--- a/node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx\n++++ b/node_modules/@react-navigation/stack/src/views/Stack/StackView.tsx\n+@@ -417,6 +417,7 @@ export default class StackView extends React.Component<Props, State> {\n+ descriptors,\n+ openingRouteKeys,\n+ closingRouteKeys,\n++ replacingRouteKeys,\n+ } = this.state;\n+\n+ const headerMode =\n+@@ -438,6 +439,7 @@ export default class StackView extends React.Component<Props, State> {\n+ routes={routes}\n+ openingRouteKeys={openingRouteKeys}\n+ closingRouteKeys={closingRouteKeys}\n++ replacingRouteKeys={replacingRouteKeys}\n+ onOpenRoute={this.handleOpenRoute}\n+ onCloseRoute={this.handleCloseRoute}\n+ onTransitionStart={this.handleTransitionStart}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Update @react-navigation/stack relative float header patch |
129,187 | 20.05.2020 14:37:24 | 14,400 | 16f66bb372e496abe13e94602a010c88a01c542a | [native] Update useNavigationBuilder patch | [
{
"change_type": "MODIFY",
"old_path": "patches/@react-navigation+core+5.5.2.patch",
"new_path": "patches/@react-navigation+core+5.5.2.patch",
"diff": "diff --git a/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx b/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx\n-index 0acdc81..7676284 100644\n+index 0acdc81..88facbb 100644\n--- a/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx\n+++ b/node_modules/@react-navigation/core/src/useNavigationBuilder.tsx\n-@@ -295,10 +295,7 @@ export default function useNavigationBuilder<\n- );\n- }\n+@@ -264,41 +264,36 @@ export default function useNavigationBuilder<\n+ getKey,\n+ } = React.useContext(NavigationStateContext);\n+\n+- const previousStateRef = React.useRef<\n+- NavigationState | PartialState<NavigationState> | undefined\n+- >();\n+- const initializedStateRef = React.useRef<State>();\n+-\n+- let isFirstStateInitialization = false;\n+-\n+- if (\n+- initializedStateRef.current === undefined ||\n+- currentState !== previousStateRef.current\n+- ) {\n++ const [initializedState, isFirstStateInitialization] = React.useMemo(() => {\n+ // If the current state isn't initialized on first render, we initialize it\n+ // We also need to re-initialize it if the state passed from parent was changed (maybe due to reset)\n+ // Otherwise assume that the state was provided as initial state\n+ // So we need to rehydrate it to make it usable\n+ if (currentState === undefined || !isStateValid(currentState)) {\n+- isFirstStateInitialization = true;\n+- initializedStateRef.current = router.getInitialState({\n+- routeNames,\n+- routeParamList,\n+- });\n++ return [\n++ router.getInitialState({\n++ routeNames,\n++ routeParamList,\n++ }),\n++ true,\n++ ];\n+ } else {\n+- initializedStateRef.current = router.getRehydratedState(\n+- currentState as PartialState<State>,\n+- {\n++ return [\n++ router.getRehydratedState(currentState as PartialState<State>, {\n+ routeNames,\n+ routeParamList,\n+- }\n+- );\n++ }),\n++ false,\n++ ];\n}\n+- }\n-\n- React.useEffect(() => {\n- previousStateRef.current = currentState;\n- }, [currentState]);\n-+ previousStateRef.current = currentState;\n++ // We explicitly don't include routeNames/routeParamList in the dep list\n++ // below. We want to avoid forcing a new state to be calculated in cases\n++ // where routeConfigs change without affecting routeNames/routeParamList.\n++ // Instead, we handle changes to these in the nextState code below. Note\n++ // that some changes to routeConfigs are explicitly ignored, such as changes\n++ // to initialParams\n++ // eslint-disable-next-line react-hooks/exhaustive-deps\n++ }, [currentState, router, isStateValid]);\nlet state =\n// If the state isn't initialized, or stale, use the state we initialized instead\n+@@ -306,7 +301,7 @@ export default function useNavigationBuilder<\n+ // So it'll be `undefined` or stale untill the first navigation event happens\n+ isStateInitialized(currentState)\n+ ? (currentState as State)\n+- : (initializedStateRef.current as State);\n++ : (initializedState as State);\n+\n+ let nextState: State = state;\n+\n+@@ -374,6 +369,12 @@ export default function useNavigationBuilder<\n+ // eslint-disable-next-line react-hooks/exhaustive-deps\n+ }, []);\n+\n++ // We initialize this ref here to avoid a new getState getting initialized\n++ // whenever initializedState changes. We want getState to have access to the\n++ // latest initializedState, but don't need it to change when that happens\n++ const initializedStateRef = React.useRef<State>();\n++ initializedStateRef.current = initializedState;\n++\n+ const getState = React.useCallback((): State => {\n+ const currentState = getCurrentState();\n+\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Update @react-navigation/core useNavigationBuilder patch |
129,187 | 20.05.2020 14:38:22 | 14,400 | a64ee574536921a3546e2446a1499a706f98c694 | [native] Fix type error in Redux state dimensions definition | [
{
"change_type": "MODIFY",
"old_path": "native/redux/redux-setup.js",
"new_path": "native/redux/redux-setup.js",
"diff": "@@ -83,7 +83,10 @@ import {\nimport reactotron from '../reactotron';\nimport reduceDrafts from '../reducers/draft-reducer';\nimport { getGlobalNavContext } from '../navigation/icky-global';\n-import { defaultTabBarHeight } from '../selectors/dimension-selectors';\n+import {\n+ defaultTabBarHeight,\n+ type DimensionsInfo,\n+} from '../selectors/dimension-selectors';\nexport type AppState = {|\nnavInfo: NavInfo,\n@@ -110,7 +113,7 @@ export type AppState = {|\nqueuedReports: $ReadOnlyArray<ClientReportCreationRequest>,\n_persist: ?PersistState,\nsessionID?: void,\n- dimensions: Dimensions,\n+ dimensions: DimensionsInfo,\nconnectivity: ConnectivityInfo,\nglobalThemeInfo: GlobalThemeInfo,\ndeviceCameraInfo: DeviceCameraInfo,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/selectors/dimension-selectors.js",
"new_path": "native/selectors/dimension-selectors.js",
"diff": "@@ -7,6 +7,11 @@ import { Platform, DeviceInfo } from 'react-native';\nimport { createSelector } from 'reselect';\n+export type DimensionsInfo = {|\n+ ...Dimensions,\n+ tabBarHeight: number,\n+|};\n+\nconst isIPhoneX = Platform.OS === 'ios' && DeviceInfo.getConstants().isIPhoneX_deprecated;\nlet statusBarHeight = 0;\n@@ -23,7 +28,7 @@ const contentBottomOffset = isIPhoneX ? 34 : 0;\nconst dimensionsSelector: (state: AppState) => Dimensions = createSelector(\n(state: AppState) => state.dimensions,\n- (dimensions: Dimensions): Dimensions => {\n+ (dimensions: DimensionsInfo): Dimensions => {\nlet { height, width } = dimensions;\nheight -= contentBottomOffset;\nif (Platform.OS === 'android') {\n@@ -41,7 +46,7 @@ const contentVerticalOffsetSelector: (\nstate: AppState,\n) => number = createSelector(\n(state: AppState) => state.dimensions,\n- (dimensions: Dimensions): number => {\n+ (dimensions: DimensionsInfo): number => {\nif (Platform.OS !== 'ios') {\nreturn 0;\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Fix type error in Redux state dimensions definition |
129,187 | 20.05.2020 20:41:09 | 14,400 | bf2d4c0d7799e91624abf557f2ba2c54cd99a59c | [native] Flow types for React Nav 5 navigation state | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"diff": "+// flow-typed signature: a69faaac78959be3028019885b5fd6ab\n+// flow-typed version: <<STUB>>/@react-navigation/native_v5.2.6/flow_v0.105.0\n+\n+declare module '@react-navigation/native' {\n+\n+ //---------------------------------------------------------------------------\n+ // SECTION 1: IDENTICAL TYPE DEFINITIONS\n+ // This section is identical across all React Navigation libdefs and contains\n+ // shared definitions. We wish we could make it DRY and import from a shared\n+ // definition, but that isn't yet possible.\n+ //---------------------------------------------------------------------------\n+\n+ /**\n+ * SECTION 1A\n+ * We start with some definitions that we have copy-pasted from React Native\n+ * source files.\n+ */\n+\n+ /**\n+ * SECTION 1B\n+ * The following are type declarations for core types necessary for every\n+ * React Navigation libdef.\n+ */\n+\n+ declare type ScreenParams = { [key: string]: mixed };\n+\n+ declare export type BackAction = {|\n+ +type: 'GO_BACK',\n+ +source?: string,\n+ +target?: string,\n+ |};\n+\n+ declare export type NavigateAction = {|\n+ +type: 'NAVIGATE',\n+ +payload:\n+ | {| key: string, params?: ScreenParams |}\n+ | {| name: string, key?: string, params?: ScreenParams |},\n+ +source?: string,\n+ +target?: string,\n+ |};\n+\n+ declare export type ResetAction = {|\n+ +type: 'RESET',\n+ +payload: PartialState<NavigationState>,\n+ +source?: string,\n+ +target?: string,\n+ |};\n+\n+ declare export type SetParamsAction = {|\n+ +type: 'SET_PARAMS',\n+ +payload: {| params?: ScreenParams |},\n+ +source?: string,\n+ +target?: string,\n+ |};\n+\n+ declare export type CommonAction =\n+ | BackAction\n+ | NavigateAction\n+ | ResetAction\n+ | SetParamsAction;\n+\n+ declare export type LeafRoute = {|\n+ +key: string,\n+ +name: string,\n+ +params?: ScreenParams,\n+ |};\n+ declare export type StateRoute = {|\n+ ...LeafRoute,\n+ +state: NavigationState | StaleNavigationState,\n+ |};\n+ declare export type Route =\n+ | LeafRoute\n+ | StateRoute;\n+\n+ declare export type NavigationState = {|\n+ +key: string,\n+ +index: number,\n+ +routeNames: $ReadOnlyArray<string>,\n+ +history?: $ReadOnlyArray<mixed>,\n+ +routes: $ReadOnlyArray<Route>,\n+ +type: string,\n+ +stale: false,\n+ |};\n+\n+ declare export type StaleLeafRoute = {|\n+ +key?: string,\n+ +name: string,\n+ +params?: ScreenParams,\n+ |};\n+ declare export type StaleStateRoute = {|\n+ ...StaleLeafRoute,\n+ +state: StaleNavigationState,\n+ |};\n+ declare export type StaleRoute =\n+ | StaleLeafRoute\n+ | StaleStateRoute;\n+ declare export type StaleNavigationState = {|\n+ // It's possible to pass React Nav a StaleNavigationState with an undefined\n+ // index, but React Nav will always return one with the index set. This is\n+ // the same as for the type property below, but in the case of index we tend\n+ // to rely on it being set more...\n+ +index: number,\n+ +history?: $ReadOnlyArray<mixed>,\n+ +routes: $ReadOnlyArray<StaleRoute>,\n+ +type?: string,\n+ +stale?: true,\n+ |};\n+\n+ declare export type PossiblyStaleNavigationState =\n+ | NavigationState\n+ | StaleNavigationState;\n+ declare export type PossiblyStaleRoute =\n+ | Route\n+ | StaleRoute;\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/default-state.js",
"new_path": "native/navigation/default-state.js",
"diff": "// @flow\nimport type { BaseNavInfo } from 'lib/types/nav-types';\n-import type { NavigationState } from 'react-navigation';\n+import type { StaleNavigationState } from '@react-navigation/native';\nimport { fifteenDaysEarlier, fifteenDaysLater } from 'lib/utils/date-utils';\n@@ -18,7 +18,7 @@ import {\nexport type NavInfo = $Exact<BaseNavInfo>;\n-const defaultNavigationState: NavigationState = {\n+const defaultNavigationState: StaleNavigationState = {\ntype: 'stack',\nindex: 1,\nroutes: [\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/modal-pruner.react.js",
"new_path": "native/navigation/modal-pruner.react.js",
"diff": "// @flow\nimport type { NavContextType } from './navigation-context';\n-import type { NavigationState, NavigationRoute } from 'react-navigation';\n+import type {\n+ PossiblyStaleNavigationState,\n+ PossiblyStaleRoute,\n+} from '@react-navigation/native';\nimport * as React from 'react';\nimport invariant from 'invariant';\n@@ -19,24 +22,28 @@ type DependencyInfo = {|\nparentRouteName: ?string,\n|};\nfunction collectDependencyInfo(\n- route: NavigationState | NavigationRoute,\n+ route: PossiblyStaleNavigationState | PossiblyStaleRoute,\ndependencyMap?: Map<string, DependencyInfo> = new Map(),\nparentRouteName?: ?string,\n): Map<string, DependencyInfo> {\nlet state, routeName;\n- if (!route.name) {\n+ if (route.name === undefined) {\nstate = route;\n} else if (route.state) {\n({ state, name: routeName } = route);\n}\nif (state) {\n- state.routes.forEach(\n- child => collectDependencyInfo(child, dependencyMap, routeName),\n- );\n+ for (let child of state.routes) {\n+ collectDependencyInfo(child, dependencyMap, routeName);\n+ }\nreturn dependencyMap;\n}\n+ if (!route.key) {\n+ return dependencyMap;\n+ }\nconst { key } = route;\n+\nconst presenter =\nroute.params && route.params.presentedFrom\n? route.params.presentedFrom\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/nav-selectors.js",
"new_path": "native/navigation/nav-selectors.js",
"diff": "// @flow\nimport type { NavContextType } from './navigation-context';\n-import type { NavigationState } from 'react-navigation';\n+import type { PossiblyStaleNavigationState } from '@react-navigation/native';\nimport type { CalendarFilter } from 'lib/types/filter-types';\nimport type { CalendarQuery } from 'lib/types/entry-types';\nimport type { GlobalTheme } from '../types/themes';\n@@ -36,7 +36,7 @@ import { NavContext } from './navigation-context';\nconst baseCreateIsForegroundSelector = (routeName: string) =>\ncreateSelector(\n(context: ?NavContextType) => context && context.state,\n- (navigationState: ?NavigationState) => {\n+ (navigationState: ?PossiblyStaleNavigationState) => {\nif (!navigationState) {\nreturn false;\n}\n@@ -66,14 +66,14 @@ const foregroundKeySelector: (\ncontext: ?NavContextType,\n) => ?string = createSelector(\n(context: ?NavContextType) => context && context.state,\n- (navigationState: ?NavigationState) =>\n+ (navigationState: ?PossiblyStaleNavigationState) =>\nnavigationState && navigationState.routes[navigationState.index].key,\n);\nconst baseCreateActiveTabSelector = (routeName: string) =>\ncreateSelector(\n(context: ?NavContextType) => context && context.state,\n- (navigationState: ?NavigationState) => {\n+ (navigationState: ?PossiblyStaleNavigationState) => {\nif (!navigationState) {\nreturn false;\n}\n@@ -100,7 +100,7 @@ const scrollBlockingChatModalsClosedSelector: (\ncontext: ?NavContextType,\n) => boolean = createSelector(\n(context: ?NavContextType) => context && context.state,\n- (navigationState: ?NavigationState) => {\n+ (navigationState: ?PossiblyStaleNavigationState) => {\nif (!navigationState) {\nreturn false;\n}\n@@ -120,7 +120,7 @@ const scrollBlockingChatModalsClosedSelector: (\n);\nfunction selectBackgroundIsDark(\n- navigationState: ?NavigationState,\n+ navigationState: ?PossiblyStaleNavigationState,\ntheme: ?GlobalTheme,\n) {\nif (!navigationState) {\n@@ -146,7 +146,7 @@ function selectBackgroundIsDark(\n}\nfunction activeThread(\n- navigationState: ?NavigationState,\n+ navigationState: ?PossiblyStaleNavigationState,\nvalidRouteNames: $ReadOnlyArray<string>,\n): ?string {\nif (!navigationState) {\n@@ -182,7 +182,7 @@ const activeThreadSelector: (\ncontext: ?NavContextType,\n) => ?string = createSelector(\n(context: ?NavContextType) => context && context.state,\n- (navigationState: ?NavigationState): ?string =>\n+ (navigationState: ?PossiblyStaleNavigationState): ?string =>\nactiveThread(navigationState, threadRoutes),\n);\n@@ -191,7 +191,7 @@ const activeMessageListSelector: (\ncontext: ?NavContextType,\n) => ?string = createSelector(\n(context: ?NavContextType) => context && context.state,\n- (navigationState: ?NavigationState): ?string =>\n+ (navigationState: ?PossiblyStaleNavigationState): ?string =>\nactiveThread(navigationState, messageListRouteNames),\n);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/navigation-context.js",
"new_path": "native/navigation/navigation-context.js",
"diff": "// @flow\n-import type { NavigationState, NavigationAction } from 'react-navigation';\n+import type { NavigationAction } from 'react-navigation';\n+import type { PossiblyStaleNavigationState } from '@react-navigation/native';\nimport type { RootRouterNavigationAction } from './root-router';\nimport type { ChatRouterNavigationAction } from '../chat/chat-router';\nimport type { OverlayRouterNavigationAction } from './overlay-router';\n@@ -15,7 +16,7 @@ export type NavAction =\n| ChatRouterNavigationAction\n| OverlayRouterNavigationAction;\nexport type NavContextType = {|\n- state: NavigationState,\n+ state: PossiblyStaleNavigationState,\ndispatch: (action: NavAction) => boolean,\n|};\n"
},
{
"change_type": "MODIFY",
"old_path": "native/root.react.js",
"new_path": "native/root.react.js",
"diff": "import { type GlobalTheme, globalThemePropType } from './types/themes';\nimport type { AppState } from './redux/redux-setup';\nimport type { NavAction } from './navigation/navigation-context';\n-import type { NavigationState, NavigationAction } from 'react-navigation';\n+import type { NavigationState } from '@react-navigation/native';\n+import type { NavigationAction } from 'react-navigation';\nimport * as React from 'react';\nimport { Provider } from 'react-redux';\n"
},
{
"change_type": "MODIFY",
"old_path": "native/utils/navigation-utils.js",
"new_path": "native/utils/navigation-utils.js",
"diff": "// @flow\nimport type {\n- NavigationLeafRoute,\n- NavigationStateRoute,\n- NavigationRoute,\n- NavigationParams,\n- NavigationState,\n-} from 'react-navigation';\n+ PossiblyStaleNavigationState,\n+ PossiblyStaleRoute,\n+ StaleLeafRoute,\n+ ScreenParams,\n+} from '@react-navigation/native';\nimport invariant from 'invariant';\n@@ -16,16 +15,17 @@ import {\n} from '../navigation/route-names';\nfunction getStateFromNavigatorRoute(\n- route: NavigationRoute,\n-): NavigationStateRoute {\n+ route: PossiblyStaleRoute,\n+): PossiblyStaleNavigationState {\n+ const key = route.key ? route.key : `unkeyed ${route.name}`;\ninvariant(\nroute.state,\n- `expecting NavigationRoute for ${route.key} to be NavigationState`,\n+ `expecting Route for ${key} to be NavigationState`,\n);\nreturn route.state;\n}\n-function getThreadIDFromParams(params: ?NavigationParams): string {\n+function getThreadIDFromParams(params: ?ScreenParams): string {\ninvariant(\nparams &&\nparams.threadInfo &&\n@@ -37,7 +37,7 @@ function getThreadIDFromParams(params: ?NavigationParams): string {\nreturn params.threadInfo.id;\n}\n-function getParentThreadIDFromParams(params: ?NavigationParams): ?string {\n+function getParentThreadIDFromParams(params: ?ScreenParams): ?string {\nif (!params) {\nreturn undefined;\n}\n@@ -55,7 +55,7 @@ function getParentThreadIDFromParams(params: ?NavigationParams): ?string {\n}\nfunction getThreadIDFromRoute(\n- route: NavigationRoute,\n+ route: PossiblyStaleRoute,\nroutes?: $ReadOnlyArray<string> = threadRoutes,\n) {\nif (!routes.includes(route.name)) {\n@@ -67,7 +67,7 @@ function getThreadIDFromRoute(\nreturn getThreadIDFromParams(route.params);\n}\n-function currentRouteRecurse(route: NavigationRoute): NavigationLeafRoute {\n+function currentRouteRecurse(route: PossiblyStaleRoute): StaleLeafRoute {\nif (!route.state) {\nreturn route;\n}\n@@ -75,11 +75,14 @@ function currentRouteRecurse(route: NavigationRoute): NavigationLeafRoute {\nreturn currentRouteRecurse(state.routes[state.index]);\n}\n-function currentLeafRoute(state: NavigationState): NavigationLeafRoute {\n+function currentLeafRoute(state: PossiblyStaleNavigationState): StaleLeafRoute {\nreturn currentRouteRecurse(state.routes[state.index]);\n}\n-function findRouteIndexWithKey(state: NavigationState, key: string): ?number {\n+function findRouteIndexWithKey(\n+ state: PossiblyStaleNavigationState,\n+ key: string,\n+): ?number {\nfor (let i = 0; i < state.routes.length; i++) {\nconst route = state.routes[i];\nif (route.key === key) {\n@@ -92,10 +95,13 @@ function findRouteIndexWithKey(state: NavigationState, key: string): ?number {\n// This function walks from the back of the stack and calls filterFunc on each\n// screen until the stack is exhausted or filterFunc returns \"break\". A screen\n// will be removed if and only if filterFunc returns \"remove\" (not \"break\").\n-function removeScreensFromStack<S: NavigationState>(\n- state: S,\n- filterFunc: (route: NavigationRoute) => 'keep' | 'remove' | 'break',\n-): S {\n+function removeScreensFromStack<\n+ Route,\n+ State: { +routes: $ReadOnlyArray<Route>, +index: number },\n+>(\n+ state: State,\n+ filterFunc: (route: Route) => 'keep' | 'remove' | 'break',\n+): State {\nconst newRoutes = [];\nlet newIndex = state.index;\nlet screenRemoved = false;\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Flow types for React Nav 5 navigation state |
129,187 | 21.05.2020 11:25:56 | 14,400 | 2932b1f3c876c41c25632a39626be1184aa47ff9 | [native] Update float Header patch | [
{
"change_type": "MODIFY",
"old_path": "patches/@react-navigation+stack+5.3.1.patch",
"new_path": "patches/@react-navigation+stack+5.3.1.patch",
"diff": "@@ -28,7 +28,7 @@ index 2665164..6fd10f5 100644\n: null\n}\ndiff --git a/node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx b/node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx\n-index b47a50d..eef1d6c 100755\n+index b47a50d..f8503c9 100755\n--- a/node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx\n+++ b/node_modules/@react-navigation/stack/src/views/Stack/CardStack.tsx\n@@ -42,6 +42,7 @@ type Props = {\n@@ -48,7 +48,7 @@ index b47a50d..eef1d6c 100755\n),\n};\n});\n-@@ -334,6 +335,49 @@ export default class CardStack extends React.Component<Props, State> {\n+@@ -334,6 +335,55 @@ export default class CardStack extends React.Component<Props, State> {\nreturn state.routes[state.index];\n};\n@@ -68,6 +68,12 @@ index b47a50d..eef1d6c 100755\n+ ...replacingRouteKeys,\n+ focusedRoute.key,\n+ ]);\n++ const prevFocusedRoute = this.props.getPreviousRoute({\n++ route: focusedRoute,\n++ });\n++ if (prevFocusedRoute) {\n++ visibleKeys.add(prevFocusedRoute.key);\n++ }\n+ if (openingRouteKeys.length > 0) {\n+ for (let scene of this.state.scenes) {\n+ const { route } = scene;\n@@ -98,7 +104,7 @@ index b47a50d..eef1d6c 100755\nrender() {\nconst {\nmode,\n-@@ -361,6 +405,7 @@ export default class CardStack extends React.Component<Props, State> {\n+@@ -361,6 +411,7 @@ export default class CardStack extends React.Component<Props, State> {\nconst focusedRoute = state.routes[state.index];\nconst focusedDescriptor = descriptors[focusedRoute.key];\nconst focusedOptions = focusedDescriptor ? focusedDescriptor.options : {};\n@@ -106,7 +112,7 @@ index b47a50d..eef1d6c 100755\nlet defaultTransitionPreset =\nmode === 'modal' ? ModalTransition : DefaultTransition;\n-@@ -383,8 +428,31 @@ export default class CardStack extends React.Component<Props, State> {\n+@@ -383,8 +434,31 @@ export default class CardStack extends React.Component<Props, State> {\n// For modals, usually we want the screen underneath to be visible, so also disable it there\nconst isScreensEnabled = Platform.OS !== 'ios' && mode !== 'modal';\n@@ -138,7 +144,7 @@ index b47a50d..eef1d6c 100755\n<MaybeScreenContainer\nenabled={isScreensEnabled}\nstyle={styles.container}\n-@@ -523,6 +591,7 @@ export default class CardStack extends React.Component<Props, State> {\n+@@ -523,6 +597,7 @@ export default class CardStack extends React.Component<Props, State> {\nheaderMode={headerMode}\nheaderShown={headerShown}\nheaderTransparent={headerTransparent}\n@@ -146,7 +152,7 @@ index b47a50d..eef1d6c 100755\nrenderHeader={renderHeader}\nrenderScene={renderScene}\nonOpenRoute={onOpenRoute}\n-@@ -537,26 +606,7 @@ export default class CardStack extends React.Component<Props, State> {\n+@@ -537,26 +612,7 @@ export default class CardStack extends React.Component<Props, State> {\n);\n})}\n</MaybeScreenContainer>\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Update @react-navigation/stack float Header patch |
129,187 | 24.05.2020 18:08:29 | 14,400 | 4d263da331a0e01cd9940560f6749ec16812e002 | [native] Fix Tooltip types | [
{
"change_type": "MODIFY",
"old_path": "native/chat/multimedia-tooltip-button.react.js",
"new_path": "native/chat/multimedia-tooltip-button.react.js",
"diff": "// @flow\nimport {\n- type MediaInfo,\nmediaInfoPropType,\ntype Dimensions,\ndimensionsPropType,\n} from 'lib/types/media-types';\nimport {\n- type VerticalBounds,\nverticalBoundsPropType,\n- type LayoutCoordinates,\nlayoutCoordinatesPropType,\n} from '../types/layout-types';\n-import type {\n- NavigationScreenProp,\n- NavigationLeafRoute,\n-} from 'react-navigation';\nimport type { AppState } from '../redux/redux-setup';\n-import type { ChatMultimediaMessageInfoItem } from './multimedia-message.react';\n+import type { AppNavigationProp } from '../navigation/app-navigator.react';\n+import type { TooltipRoute } from '../navigation/tooltip.react';\nimport * as React from 'react';\nimport Animated from 'react-native-reanimated';\n@@ -41,25 +35,9 @@ import { dimensionsSelector } from '../selectors/dimension-selectors';\nconst { Value } = Animated;\n-type Route = {|\n- ...NavigationLeafRoute,\n- params: {\n- // Tooltip props\n- initialCoordinates: LayoutCoordinates,\n- verticalBounds: VerticalBounds,\n- location?: 'above' | 'below',\n- margin?: number,\n- // Custom props\n- item: ChatMultimediaMessageInfoItem,\n- mediaInfo: MediaInfo,\n- verticalOffset: number,\n- },\n-|};\n-type NavProp = NavigationScreenProp<Route>;\n-\ntype Props = {\n- navigation: NavProp,\n- route: Route,\n+ navigation: AppNavigationProp<'MultimediaTooltipModal'>,\n+ route: TooltipRoute<'MultimediaTooltipModal',>,\nprogress: Value,\n// Redux state\nscreenDimensions: Dimensions,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/multimedia-tooltip-modal.react.js",
"new_path": "native/chat/multimedia-tooltip-modal.react.js",
"diff": "import type { MediaInfo } from 'lib/types/media-types';\nimport type { ChatMultimediaMessageInfoItem } from './multimedia-message.react';\n-import { createTooltip, tooltipHeight } from '../navigation/tooltip.react';\n+import {\n+ createTooltip,\n+ tooltipHeight,\n+ type TooltipParams,\n+} from '../navigation/tooltip.react';\nimport MultimediaTooltipButton from './multimedia-tooltip-button.react';\nimport { intentionalSaveMedia } from '../media/save-media';\n@@ -13,6 +17,8 @@ type CustomProps = {\nverticalOffset: number,\n};\n+export type MultimediaTooltipModalParams = TooltipParams<CustomProps>;\n+\nfunction onPressSave(props: CustomProps) {\nconst { mediaInfo, item } = props;\nconst { id: uploadID, uri } = mediaInfo;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/settings/thread-settings-member-tooltip-button.react.js",
"new_path": "native/chat/settings/thread-settings-member-tooltip-button.react.js",
"diff": "// @flow\n-import type {\n- NavigationScreenProp,\n- NavigationLeafRoute,\n-} from 'react-navigation';\n+import type { AppNavigationProp } from '../../navigation/app-navigator.react';\nimport * as React from 'react';\nimport { TouchableOpacity } from 'react-native';\n@@ -12,7 +9,7 @@ import PropTypes from 'prop-types';\nimport PencilIcon from './pencil-icon.react';\ntype Props = {\n- navigation: NavigationScreenProp<NavigationLeafRoute>,\n+ navigation: AppNavigationProp<'ThreadSettingsMemberTooltipModal'>,\n};\nclass ThreadSettingsMemberTooltipButton extends React.PureComponent<Props> {\nstatic propTypes = {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/settings/thread-settings-member-tooltip-modal.react.js",
"new_path": "native/chat/settings/thread-settings-member-tooltip-modal.react.js",
"diff": "@@ -19,7 +19,10 @@ import {\n} from 'lib/actions/thread-actions';\nimport { memberIsAdmin } from 'lib/shared/thread-utils';\n-import { createTooltip } from '../../navigation/tooltip.react';\n+import {\n+ createTooltip,\n+ type TooltipParams,\n+} from '../../navigation/tooltip.react';\nimport ThreadSettingsMemberTooltipButton from './thread-settings-member-tooltip-button.react';\ntype CustomProps = {\n@@ -27,6 +30,8 @@ type CustomProps = {\nthreadInfo: ThreadInfo,\n};\n+export type ThreadSettingsMemberTooltipModalParams = TooltipParams<CustomProps>;\n+\nfunction onRemoveUser(\nprops: CustomProps,\ndispatchFunctions: DispatchFunctions,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/text-message-tooltip-button.react.js",
"new_path": "native/chat/text-message-tooltip-button.react.js",
"diff": "// @flow\n-import type { ChatTextMessageInfoItemWithHeight } from './text-message.react';\nimport {\n- type VerticalBounds,\nverticalBoundsPropType,\n- type LayoutCoordinates,\nlayoutCoordinatesPropType,\n} from '../types/layout-types';\n-import type {\n- NavigationScreenProp,\n- NavigationLeafRoute,\n-} from 'react-navigation';\nimport { type Dimensions, dimensionsPropType } from 'lib/types/media-types';\nimport { chatMessageItemPropType } from 'lib/selectors/chat-selectors';\nimport type { AppState } from '../redux/redux-setup';\n+import type { AppNavigationProp } from '../navigation/app-navigator.react';\n+import type { TooltipRoute } from '../navigation/tooltip.react';\nimport * as React from 'react';\nimport Animated from 'react-native-reanimated';\n@@ -27,23 +22,9 @@ import { MessageHeader } from './message-header.react';\nconst { Value } = Animated;\n-type Route = {|\n- ...NavigationLeafRoute,\n- params: {\n- // Tooltip props\n- initialCoordinates: LayoutCoordinates,\n- verticalBounds: VerticalBounds,\n- location?: 'above' | 'below',\n- margin?: number,\n- // Custom props\n- item: ChatTextMessageInfoItemWithHeight,\n- },\n-|};\n-type NavProp = NavigationScreenProp<Route>;\n-\ntype Props = {\n- navigation: NavProp,\n- route: Route,\n+ navigation: AppNavigationProp<'TextMessageTooltipModal'>,\n+ route: TooltipRoute<'TextMessageTooltipModal',>,\nprogress: Value,\n// Redux state\nscreenDimensions: Dimensions,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/text-message-tooltip-modal.react.js",
"new_path": "native/chat/text-message-tooltip-modal.react.js",
"diff": "@@ -4,7 +4,11 @@ import type { ChatTextMessageInfoItemWithHeight } from './text-message.react';\nimport { Clipboard } from 'react-native';\n-import { createTooltip, tooltipHeight } from '../navigation/tooltip.react';\n+import {\n+ createTooltip,\n+ tooltipHeight,\n+ type TooltipParams,\n+} from '../navigation/tooltip.react';\nimport TextMessageTooltipButton from './text-message-tooltip-button.react';\nimport { displayActionResultModal } from '../navigation/action-result-modal';\n@@ -12,6 +16,8 @@ type CustomProps = {\nitem: ChatTextMessageInfoItemWithHeight,\n};\n+export type TextMessageTooltipModalParams = TooltipParams<CustomProps>;\n+\nconst confirmCopy = () => displayActionResultModal('copied!');\nfunction onPressCopy(props: CustomProps) {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/tooltip-item.react.js",
"new_path": "native/navigation/tooltip-item.react.js",
"diff": "@@ -17,23 +17,26 @@ import {\n} from 'react-native';\nimport PropTypes from 'prop-types';\n-export type TooltipEntry<CustomProps> = {|\n+export type TooltipEntry<Params> = {|\nid: string,\ntext: string,\nonPress: (\n- props: CustomProps,\n+ props: Params,\ndispatchFunctions: DispatchFunctions,\nbindServerCall: (serverCall: ActionFunc) => BoundServerCall,\n) => mixed,\n|};\n-type Props<CustomProps: {}> = {\n- spec: TooltipEntry<CustomProps>,\n- onPress: (entry: TooltipEntry<CustomProps>) => void,\n+type Props<Params, Entry: TooltipEntry<Params>> = {\n+ spec: Entry,\n+ onPress: (entry: Entry) => void,\ncontainerStyle?: ViewStyle,\nlabelStyle?: TextStyle,\n};\n-class TooltipItem<CP: {}> extends React.PureComponent<Props<CP>> {\n+class TooltipItem<\n+ Params,\n+ Entry: TooltipEntry<Params>,\n+> extends React.PureComponent<Props<Params, Entry>> {\nstatic propTypes = {\nspec: PropTypes.shape({\ntext: PropTypes.string.isRequired,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/tooltip.react.js",
"new_path": "native/navigation/tooltip.react.js",
"diff": "// @flow\n-import type {\n- NavigationLeafRoute,\n- NavigationStackProp,\n-} from 'react-navigation-stack';\nimport {\ntype VerticalBounds,\nverticalBoundsPropType,\n@@ -21,6 +17,11 @@ import type {\nActionFunc,\n} from 'lib/utils/action-utils';\nimport type { LayoutEvent } from '../types/react-native';\n+import type {\n+ AppNavigationProp,\n+ TooltipModalParamList,\n+} from './app-navigator.react';\n+import type { LeafRoute } from '@react-navigation/native';\nimport * as React from 'react';\nimport Animated from 'react-native-reanimated';\n@@ -56,31 +57,40 @@ import {\nconst { Value, Extrapolate, add, multiply, interpolate } = Animated;\n/* eslint-enable import/no-named-as-default-member */\n-type TooltipSpec<CustomProps> = {|\n- entries: $ReadOnlyArray<TooltipEntry<CustomProps>>,\n+type TooltipSpec<Entry> = {|\n+ entries: $ReadOnlyArray<Entry>,\nlabelStyle?: ViewStyle,\n|};\n-type Route<CustomProps> = {|\n- ...NavigationLeafRoute,\n- params: {\n- ...$Exact<CustomProps>,\n+type TooltipCommonProps = {\npresentedFrom: string,\ninitialCoordinates: LayoutCoordinates,\nverticalBounds: VerticalBounds,\nlocation?: 'above' | 'below',\nmargin?: number,\nvisibleEntryIDs?: $ReadOnlyArray<string>,\n- },\n+};\n+\n+export type TooltipParams<CustomProps> = {|\n+ ...$Exact<CustomProps>,\n+ ...$Exact<TooltipCommonProps>,\n|};\n-type NavProp<CustomProps> = NavigationStackProp<Route<CustomProps>>;\n-type ButtonProps<Navigation> = {\n+export type TooltipRoute<\n+ RouteName: $Keys<TooltipModalParamList>,\n+ Params = $ElementType<TooltipModalParamList, RouteName>,\n+> = {|\n+ ...LeafRoute<RouteName>,\n+ +params: Params,\n+|};\n+\n+type ButtonProps<Navigation, Route> = {\nnavigation: Navigation,\n+ route: Route,\nprogress: Value,\n};\n-type TooltipProps<Navigation> = {\n+type TooltipProps<Navigation, Route> = {\nnavigation: Navigation,\nroute: Route,\n// Redux state\n@@ -94,11 +104,17 @@ type TooltipProps<Navigation> = {\noverlayContext: ?OverlayContextType,\n};\nfunction createTooltip<\n- CustomProps: {},\n- Navigation: NavProp<CustomProps>,\n- TooltipPropsType: TooltipProps<Navigation>,\n- ButtonComponentType: React.ComponentType<ButtonProps<Navigation>>,\n->(ButtonComponent: ButtonComponentType, tooltipSpec: TooltipSpec<CustomProps>) {\n+ RouteName: $Keys<TooltipModalParamList>,\n+ Navigation: AppNavigationProp<RouteName>,\n+ Params: TooltipCommonProps,\n+ Route: TooltipRoute<RouteName, Params>,\n+ Entry: TooltipEntry<Params>,\n+ TooltipPropsType: TooltipProps<Navigation, Route>,\n+ ButtonComponentType: React.ComponentType<ButtonProps<Navigation, Route>>,\n+>(\n+ ButtonComponent: ButtonComponentType,\n+ tooltipSpec: TooltipSpec<Entry>,\n+) {\nclass Tooltip extends React.PureComponent<TooltipPropsType> {\nstatic propTypes = {\nnavigation: PropTypes.shape({\n@@ -359,22 +375,18 @@ function createTooltip<\nthis.props.navigation.goBack();\n};\n- onPressEntry = (entry: TooltipEntry<CustomProps>) => {\n- const {\n- initialCoordinates,\n- verticalBounds,\n- location,\n- margin,\n- visibleEntryIDs,\n- ...customProps\n- } = this.props.route.params;\n+ onPressEntry = (entry: Entry) => {\nthis.props.navigation.goBack();\nconst dispatchFunctions = {\ndispatch: this.props.dispatch,\ndispatchActionPayload: this.props.dispatchActionPayload,\ndispatchActionPromise: this.props.dispatchActionPromise,\n};\n- entry.onPress(customProps, dispatchFunctions, this.bindServerCall);\n+ entry.onPress(\n+ this.props.route.params,\n+ dispatchFunctions,\n+ this.bindServerCall,\n+ );\n};\nbindServerCall = (serverCall: ActionFunc) => {\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Fix Tooltip types |
129,187 | 24.05.2020 18:29:25 | 14,400 | 0b4675aa5f042dc9ab4601f804c254d155293bf3 | [native] Make custom navigation actions conform to GenericNavigationAction | [
{
"change_type": "MODIFY",
"old_path": "native/chat/settings/delete-thread.react.js",
"new_path": "native/chat/settings/delete-thread.react.js",
"diff": "@@ -242,7 +242,7 @@ class DeleteThread extends React.PureComponent<Props, State> {\ninvariant(navContext, 'navContext should exist in deleteThread');\nnavContext.dispatch({\ntype: clearThreadsActionType,\n- threadIDs: [threadInfo.id],\n+ payload: { threadIDs: [threadInfo.id] },\n});\ntry {\nconst result = await this.props.deleteThread(\n@@ -255,7 +255,7 @@ class DeleteThread extends React.PureComponent<Props, State> {\n);\nnavContext.dispatch({\ntype: clearThreadsActionType,\n- threadIDs: [...invalidated],\n+ payload: { threadIDs: [...invalidated] },\n});\nreturn result;\n} catch (e) {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/settings/thread-settings-leave-thread.react.js",
"new_path": "native/chat/settings/thread-settings-leave-thread.react.js",
"diff": "@@ -129,7 +129,7 @@ class ThreadSettingsLeaveThread extends React.PureComponent<Props> {\ninvariant(navContext, 'navContext should exist in leaveThread');\nnavContext.dispatch({\ntype: clearThreadsActionType,\n- threadIDs: [threadID],\n+ payload: { threadIDs: [threadID] },\n});\ntry {\nconst result = await this.props.leaveThread(threadID);\n@@ -139,7 +139,7 @@ class ThreadSettingsLeaveThread extends React.PureComponent<Props> {\n);\nnavContext.dispatch({\ntype: clearThreadsActionType,\n- threadIDs: [...invalidated],\n+ payload: { threadIDs: [...invalidated] },\n});\nreturn result;\n} catch (e) {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/thread-screen-pruner.react.js",
"new_path": "native/chat/thread-screen-pruner.react.js",
"diff": "@@ -70,8 +70,7 @@ const ThreadScreenPruner = React.memo<{||}>(() => {\n}\nnavContext.dispatch({\ntype: clearThreadsActionType,\n- threadIDs: pruneThreadIDs,\n- preserveFocus: true,\n+ payload: { threadIDs: pruneThreadIDs },\n});\n}, [pruneThreadIDs, navContext, activeThreadID]);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/modal-pruner.react.js",
"new_path": "native/navigation/modal-pruner.react.js",
"diff": "@@ -119,13 +119,13 @@ function ModalPruner(props: Props) {\nif (pruneRootModals.length > 0) {\ndispatch({\ntype: (clearRootModalsActionType: 'CLEAR_ROOT_MODALS'),\n- keys: pruneRootModals,\n+ payload: { keys: pruneRootModals },\n});\n}\nif (pruneOverlayModals.length > 0) {\ndispatch({\ntype: (clearOverlayModalsActionType: 'CLEAR_OVERLAY_MODALS'),\n- keys: pruneOverlayModals,\n+ payload: { keys: pruneOverlayModals },\n});\n}\n}, [dispatch, pruneRootModals, pruneOverlayModals]);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/nav-from-redux-handler.react.js",
"new_path": "native/navigation/nav-from-redux-handler.react.js",
"diff": "@@ -25,7 +25,7 @@ const NavFromReduxHandler = React.memo<{||}>(() => {\nif (navStateInRedux) {\ndispatch({\ntype: setNavStateActionType,\n- state: navStateInRedux,\n+ payload: { state: navStateInRedux },\n});\n}\n}, [dispatch, navStateInRedux]);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-router.js",
"new_path": "native/navigation/overlay-router.js",
"diff": "@@ -15,7 +15,9 @@ import { clearOverlayModalsActionType } from './action-types';\ntype ClearOverlayModalsAction = {|\n+type: 'CLEAR_OVERLAY_MODALS',\n+ +payload: {|\n+keys: $ReadOnlyArray<string>,\n+ |},\n|};\nexport type OverlayRouterNavigationAction =\n| StackAction\n@@ -39,7 +41,7 @@ function OverlayRouter(options: StackOptions) {\noptions,\n) => {\nif (action.type === clearOverlayModalsActionType) {\n- const { keys } = action;\n+ const { keys } = action.payload;\nif (!lastState) {\nreturn lastState;\n}\n@@ -56,7 +58,7 @@ function OverlayRouter(options: StackOptions) {\n...stackRouter.actionCreators,\nclearOverlayModals: (keys: $ReadOnlyArray<string>) => ({\ntype: clearOverlayModalsActionType,\n- keys,\n+ payload: { keys },\n}),\n},\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/root-router.js",
"new_path": "native/navigation/root-router.js",
"diff": "@@ -35,12 +35,16 @@ type LogOutAction = {|\n|};\ntype ClearRootModalsAction = {|\n+type: 'CLEAR_ROOT_MODALS',\n+ +payload: {|\n+keys: $ReadOnlyArray<string>,\n+ |},\n|};\ntype SetNavStateAction = {|\n+type: 'SET_NAV_STATE',\n+ +payload: {|\n+state: NavigationState,\n+hideFromMonitor?: boolean,\n+ |},\n|};\nexport type RootRouterNavigationAction =\n| StackAction\n@@ -149,7 +153,7 @@ function RootRouter(options: StackOptions) {\noptions,\n);\n} else if (action.type === clearRootModalsActionType) {\n- const { keys } = action;\n+ const { keys } = action.payload;\nif (!lastState) {\nreturn lastState;\n}\n@@ -159,7 +163,7 @@ function RootRouter(options: StackOptions) {\nkeys.includes(route.key) ? 'remove' : 'keep',\n);\n} else if (action.type === setNavStateActionType) {\n- return action.state;\n+ return action.payload.state;\n} else {\nif (!lastState) {\nreturn lastState;\n@@ -185,15 +189,14 @@ function RootRouter(options: StackOptions) {\nlogOut: () => ({ type: logOutActionType }),\nclearRootModals: (keys: $ReadOnlyArray<string>) => ({\ntype: clearRootModalsActionType,\n- keys,\n+ payload: { keys },\n}),\nsetNavState: (\nstate: NavigationState,\nhideFromMonitor?: boolean = false,\n) => ({\ntype: setNavStateActionType,\n- state,\n- hideFromMonitor,\n+ payload: { state, hideFromMonitor },\n}),\n},\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "native/push/push-handler.react.js",
"new_path": "native/push/push-handler.react.js",
"diff": "@@ -17,10 +17,7 @@ import {\n} from 'lib/types/socket-types';\nimport type { RemoteMessage, NotificationOpen } from 'react-native-firebase';\nimport { type GlobalTheme, globalThemePropType } from '../types/themes';\n-import type {\n- NavigationScreenProp,\n- NavigationState,\n-} from '@react-navigation/native';\n+import type { RootNavigationProp } from '../navigation/root-navigator.react';\nimport * as React from 'react';\nimport PropTypes from 'prop-types';\n@@ -92,7 +89,7 @@ const supportsTapticFeedback =\nPlatform.OS === 'ios' && parseInt(Platform.Version, 10) >= 10;\ntype Props = {\n- navigation: NavigationScreenProp<NavigationState>,\n+ navigation: RootNavigationProp<'App'>,\n// Navigation state\nactiveThread: ?string,\n// Redux state\n@@ -464,7 +461,7 @@ class PushHandler extends React.PureComponent<Props, State> {\nif (clearChatRoutes) {\nthis.props.navigation.dispatch({\ntype: replaceWithThreadActionType,\n- threadInfo,\n+ payload: { threadInfo },\n});\n} else {\nthis.props.navigation.navigate({\n"
},
{
"change_type": "MODIFY",
"old_path": "native/redux/dev-tools.react.js",
"new_path": "native/redux/dev-tools.react.js",
"diff": "@@ -50,7 +50,7 @@ const DevTools = React.memo<{||}>(() => {\n} else if (\n(action.type === setNavStateActionType ||\naction.type === setReduxStateActionType) &&\n- action.hideFromMonitor\n+ action.payload.hideFromMonitor\n) {\n// Triggered by handleActionFromMonitor below when somebody is stepping\n// through actions in the SquadCal monitor in Redux dev tools\n@@ -83,8 +83,10 @@ const DevTools = React.memo<{||}>(() => {\nif (navDispatch) {\nnavDispatch({\ntype: setNavStateActionType,\n+ payload: {\nstate: navState,\nhideFromMonitor: true,\n+ },\n});\n} else {\nconsole.log('could not set state in ReactNav');\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Make custom navigation actions conform to GenericNavigationAction |
129,187 | 24.05.2020 23:55:58 | 14,400 | d52e1c9ff0f87276547add6e81111a97d0346b6b | [native] Type React Nav 5 CommonActions | [
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"diff": "@@ -35,7 +35,7 @@ declare module '@react-navigation/bottom-tabs' {\ndeclare type $IsUndefined<X> = $IsA<X, void>;\ndeclare type $IsExact<X> = $IsA<X, $Exact<X>>;\n- declare type ScreenParams = { +[key: string]: mixed };\n+ declare export type ScreenParams = { +[key: string]: mixed };\ndeclare export type BackAction = {|\n+type: 'GO_BACK',\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"diff": "@@ -35,7 +35,7 @@ declare module '@react-navigation/native' {\ndeclare type $IsUndefined<X> = $IsA<X, void>;\ndeclare type $IsExact<X> = $IsA<X, $Exact<X>>;\n- declare type ScreenParams = { +[key: string]: mixed };\n+ declare export type ScreenParams = { +[key: string]: mixed };\ndeclare export type BackAction = {|\n+type: 'GO_BACK',\n@@ -265,4 +265,50 @@ declare module '@react-navigation/native' {\n...\n};\n+ //---------------------------------------------------------------------------\n+ // SECTION 2: SHARED TYPE DEFINITIONS\n+ // This section too is copy-pasted, but it's not identical across all React\n+ // Navigation libdefs. We pick out bits and pieces that we need.\n+ //---------------------------------------------------------------------------\n+\n+ /**\n+ * SECTION 2A\n+ * We start with definitions we have copy-pasted, either from in-package\n+ * types, other Flow libdefs, or from TypeScript types somewhere.\n+ */\n+\n+ /**\n+ * SECTION 2B\n+ * The following are the actually useful definitions in Section 2, that are\n+ * used below in section 3, but also in other libdefs.\n+ */\n+\n+ //---------------------------------------------------------------------------\n+ // SECTION 3: UNIQUE TYPE DEFINITIONS\n+ // This section normally contains exported types that are not present in any\n+ // other React Navigation libdef. But the main react-navigation libdef doesn't\n+ // have any, so it's empty here.\n+ //---------------------------------------------------------------------------\n+\n+ //---------------------------------------------------------------------------\n+ // SECTION 4: EXPORTED MODULE\n+ // This is the only section that types exports. Other sections export types,\n+ // but this section types the module's exports.\n+ //---------------------------------------------------------------------------\n+\n+ declare type NavigateActionCreator = {|\n+ (routeName: string, params?: ScreenParams): NavigateAction,\n+ (\n+ | {| key: string, params?: ScreenParams |}\n+ | {| name: string, key?: string, params?: ScreenParams |},\n+ ): NavigateAction,\n+ |};\n+\n+ declare export var CommonActions: {|\n+ navigate: NavigateActionCreator,\n+ goBack: () => BackAction,\n+ reset: (state: PossiblyStaleNavigationState) => ResetAction,\n+ setParams: (params: ScreenParams) => SetParamsAction,\n+ |};\n+\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"diff": "@@ -35,7 +35,7 @@ declare module '@react-navigation/stack' {\ndeclare type $IsUndefined<X> = $IsA<X, void>;\ndeclare type $IsExact<X> = $IsA<X, $Exact<X>>;\n- declare type ScreenParams = { +[key: string]: mixed };\n+ declare export type ScreenParams = { +[key: string]: mixed };\ndeclare export type BackAction = {|\n+type: 'GO_BACK',\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/navigation-context.js",
"new_path": "native/navigation/navigation-context.js",
"diff": "// @flow\n-import type { PossiblyStaleNavigationState } from '@react-navigation/native';\n+import type {\n+ CommonAction,\n+ PossiblyStaleNavigationState,\n+} from '@react-navigation/native';\nimport type { RootRouterNavigationAction } from './root-router';\nimport type { ChatRouterNavigationAction } from '../chat/chat-router';\nimport type { OverlayRouterNavigationAction } from './overlay-router';\n@@ -10,6 +13,7 @@ import hoistNonReactStatics from 'hoist-non-react-statics';\nimport PropTypes from 'prop-types';\nexport type NavAction =\n+ | CommonAction\n| RootRouterNavigationAction\n| ChatRouterNavigationAction\n| OverlayRouterNavigationAction;\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Type React Nav 5 CommonActions |
129,187 | 25.05.2020 14:20:08 | 14,400 | 9e0f01cb8f9b78ea3f30b66806856eadd8b4b49f | [native] Type React Nav StackView | [
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"diff": "@@ -129,7 +129,7 @@ declare module '@react-navigation/bottom-tabs' {\n| Route<RouteName>\n| StaleRoute<RouteName>;\n- declare type ParamListBase = { +[key: string]: ?ScreenParams };\n+ declare export type ParamListBase = { +[key: string]: ?ScreenParams };\ndeclare type EventMapBase = {\n+[name: string]: {|\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"diff": "@@ -129,7 +129,7 @@ declare module '@react-navigation/native' {\n| Route<RouteName>\n| StaleRoute<RouteName>;\n- declare type ParamListBase = { +[key: string]: ?ScreenParams };\n+ declare export type ParamListBase = { +[key: string]: ?ScreenParams };\ndeclare type EventMapBase = {\n+[name: string]: {|\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"diff": "@@ -129,7 +129,7 @@ declare module '@react-navigation/stack' {\n| Route<RouteName>\n| StaleRoute<RouteName>;\n- declare type ParamListBase = { +[key: string]: ?ScreenParams };\n+ declare export type ParamListBase = { +[key: string]: ?ScreenParams };\ndeclare type EventMapBase = {\n+[name: string]: {|\n@@ -702,4 +702,19 @@ declare module '@react-navigation/stack' {\nprops: StackHeaderInterpolationProps,\n) => StackHeaderInterpolatedStyle;\n+ //---------------------------------------------------------------------------\n+ // SECTION 4: EXPORTED MODULE\n+ // This is the only section that types exports. Other sections export types,\n+ // but this section types the module's exports.\n+ //---------------------------------------------------------------------------\n+\n+ declare export var StackView: React.ComponentType<{|\n+ mode?: 'card' | 'modal',\n+ headerMode?: 'float' | 'screen' | 'none',\n+ keyboardHandlingEnabled?: boolean,\n+ state: StackNavigationState,\n+ navigation: StackNavigationProp<>,\n+ descriptors: {| [key: string]: StackDescriptor |},\n+ |}>;\n+\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Type React Nav StackView |
129,187 | 25.05.2020 15:04:32 | 14,400 | 4d04032b03e3de728690052f53f5394bf864453e | [native] Type React Nav BottomTabBar | [
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"diff": "@@ -372,7 +372,7 @@ declare module '@react-navigation/bottom-tabs' {\ndelay?: number,\n};\n- // Copied from react-native/Libraries/Types/CoreEventTypes\n+ // Copied from react-native/Libraries/Types/CoreEventTypes.js\ndeclare type SyntheticEvent<T> = $ReadOnly<{|\nbubbles: ?boolean,\ncancelable: ?boolean,\n@@ -404,8 +404,54 @@ declare module '@react-navigation/bottom-tabs' {\nlayout: Layout,\n|}>,\n>;\n+ declare type BlurEvent = SyntheticEvent<\n+ $ReadOnly<{|\n+ target: number,\n+ |}>,\n+ >;\n+ declare type FocusEvent = SyntheticEvent<\n+ $ReadOnly<{|\n+ target: number,\n+ |}>,\n+ >;\n+ declare type ResponderSyntheticEvent<T> = $ReadOnly<{|\n+ ...SyntheticEvent<T>,\n+ touchHistory: $ReadOnly<{|\n+ indexOfSingleActiveTouch: number,\n+ mostRecentTimeStamp: number,\n+ numberActiveTouches: number,\n+ touchBank: $ReadOnlyArray<\n+ $ReadOnly<{|\n+ touchActive: boolean,\n+ startPageX: number,\n+ startPageY: number,\n+ startTimeStamp: number,\n+ currentPageX: number,\n+ currentPageY: number,\n+ currentTimeStamp: number,\n+ previousPageX: number,\n+ previousPageY: number,\n+ previousTimeStamp: number,\n+ |}>,\n+ >,\n+ |}>,\n+ |}>;\n+ declare type PressEvent = ResponderSyntheticEvent<\n+ $ReadOnly<{|\n+ changedTouches: $ReadOnlyArray<$PropertyType<PressEvent, 'nativeEvent'>>,\n+ force: number,\n+ identifier: number,\n+ locationX: number,\n+ locationY: number,\n+ pageX: number,\n+ pageY: number,\n+ target: ?number,\n+ timestamp: number,\n+ touches: $ReadOnlyArray<$PropertyType<PressEvent, 'nativeEvent'>>,\n+ |}>,\n+ >;\n- // This is copied from\n+ // Copied from\n// react-native/Libraries/Animated/src/nodes/AnimatedInterpolation.js\ndeclare type ExtrapolateType = 'extend' | 'identity' | 'clamp';\ndeclare type InterpolationConfigType = {\n@@ -420,6 +466,97 @@ declare module '@react-navigation/bottom-tabs' {\ninterpolate(config: InterpolationConfigType): AnimatedInterpolation;\n}\n+ // Copied from react-native/Libraries/Components/View/ViewAccessibility.js\n+ declare type AccessibilityRole =\n+ | 'none'\n+ | 'button'\n+ | 'link'\n+ | 'search'\n+ | 'image'\n+ | 'keyboardkey'\n+ | 'text'\n+ | 'adjustable'\n+ | 'imagebutton'\n+ | 'header'\n+ | 'summary'\n+ | 'alert'\n+ | 'checkbox'\n+ | 'combobox'\n+ | 'menu'\n+ | 'menubar'\n+ | 'menuitem'\n+ | 'progressbar'\n+ | 'radio'\n+ | 'radiogroup'\n+ | 'scrollbar'\n+ | 'spinbutton'\n+ | 'switch'\n+ | 'tab'\n+ | 'tablist'\n+ | 'timer'\n+ | 'toolbar';\n+ declare type AccessibilityActionInfo = $ReadOnly<{\n+ name: string,\n+ label?: string,\n+ ...\n+ }>;\n+ declare type AccessibilityActionEvent = SyntheticEvent<\n+ $ReadOnly<{actionName: string, ...}>,\n+ >;\n+ declare type AccessibilityState = {\n+ disabled?: boolean,\n+ selected?: boolean,\n+ checked?: ?boolean | 'mixed',\n+ busy?: boolean,\n+ expanded?: boolean,\n+ ...\n+ };\n+ declare type AccessibilityValue = $ReadOnly<{|\n+ min?: number,\n+ max?: number,\n+ now?: number,\n+ text?: string,\n+ |}>;\n+\n+ // Copied from\n+ // react-native/Libraries/Components/Touchable/TouchableWithoutFeedback.js\n+ declare type Stringish = string;\n+ declare type EdgeInsetsProp = $ReadOnly<$Shape<EdgeInsets>>;\n+ declare type TouchableWithoutFeedbackProps = $ReadOnly<{|\n+ accessibilityActions?: ?$ReadOnlyArray<AccessibilityActionInfo>,\n+ accessibilityElementsHidden?: ?boolean,\n+ accessibilityHint?: ?Stringish,\n+ accessibilityIgnoresInvertColors?: ?boolean,\n+ accessibilityLabel?: ?Stringish,\n+ accessibilityLiveRegion?: ?('none' | 'polite' | 'assertive'),\n+ accessibilityRole?: ?AccessibilityRole,\n+ accessibilityState?: ?AccessibilityState,\n+ accessibilityValue?: ?AccessibilityValue,\n+ accessibilityViewIsModal?: ?boolean,\n+ accessible?: ?boolean,\n+ children?: ?React$Node,\n+ delayLongPress?: ?number,\n+ delayPressIn?: ?number,\n+ delayPressOut?: ?number,\n+ disabled?: ?boolean,\n+ focusable?: ?boolean,\n+ hitSlop?: ?EdgeInsetsProp,\n+ importantForAccessibility?: ?('auto' | 'yes' | 'no' | 'no-hide-descendants'),\n+ nativeID?: ?string,\n+ onAccessibilityAction?: ?(event: AccessibilityActionEvent) => mixed,\n+ onBlur?: ?(event: BlurEvent) => mixed,\n+ onFocus?: ?(event: FocusEvent) => mixed,\n+ onLayout?: ?(event: LayoutEvent) => mixed,\n+ onLongPress?: ?(event: PressEvent) => mixed,\n+ onPress?: ?(event: PressEvent) => mixed,\n+ onPressIn?: ?(event: PressEvent) => mixed,\n+ onPressOut?: ?(event: PressEvent) => mixed,\n+ pressRetentionOffset?: ?EdgeInsetsProp,\n+ rejectResponderTermination?: ?boolean,\n+ testID?: ?string,\n+ touchSoundDisabled?: ?boolean,\n+ |}>;\n+\n/**\n* SECTION 2B\n* The following are the actually useful definitions in Section 2, that are\n@@ -472,21 +609,21 @@ declare module '@react-navigation/bottom-tabs' {\n+history: $ReadOnlyArray<{| type: 'route', key: string |}>,\n|};\n- declare export type BottomTabBarOptions = $Shape<{|\n- keyboardHidesTabBar: boolean,\n- activeTintColor: string,\n- inactiveTintColor: string,\n- activeBackgroundColor: string,\n- inactiveBackgroundColor: string,\n- allowFontScaling: boolean,\n- showLabel: boolean,\n- showIcon: boolean,\n- labelStyle: TextStyleProp,\n- tabStyle: ViewStyleProp,\n- labelPosition: 'beside-icon' | 'below-icon',\n- adaptive: boolean,\n- safeAreaInsets: $Shape<EdgeInsets>,\n- style: ViewStyleProp,\n+ declare export type BottomTabNavigationOptions = $Shape<{|\n+ title: string,\n+ tabBarLabel:\n+ | string\n+ | ({| focused: boolean, color: string |}) => React$Node,\n+ tabBarIcon: ({|\n+ focused: boolean,\n+ color: string,\n+ size: number,\n+ |}) => React$Node,\n+ tabBarAccessibilityLabel: string,\n+ tabBarTestID: string,\n+ tabBarVisible: boolean,\n+ tabBarButton: BottomTabBarButtonProps => React$Node,\n+ unmountOnBlur: boolean,\n|}>;\ndeclare type BottomTabNavigationEventMap = {|\n@@ -502,7 +639,7 @@ declare module '@react-navigation/bottom-tabs' {\nParamList,\nRouteName,\nTabNavigationState,\n- BottomTabBarOptions,\n+ BottomTabNavigationOptions,\nBottomTabNavigationEventMap,\n>>,\n+jumpTo: SimpleNavigate<$If<\n@@ -512,4 +649,51 @@ declare module '@react-navigation/bottom-tabs' {\n>>,\n|};\n+ declare export type BottomTabDescriptor = Descriptor<\n+ ParamListBase,\n+ string,\n+ TabNavigationState,\n+ BottomTabNavigationOptions,\n+ >;\n+\n+ declare export type BottomTabBarOptions = $Shape<{|\n+ keyboardHidesTabBar: boolean,\n+ activeTintColor: string,\n+ inactiveTintColor: string,\n+ activeBackgroundColor: string,\n+ inactiveBackgroundColor: string,\n+ allowFontScaling: boolean,\n+ showLabel: boolean,\n+ showIcon: boolean,\n+ labelStyle: TextStyleProp,\n+ tabStyle: ViewStyleProp,\n+ labelPosition: 'beside-icon' | 'below-icon',\n+ adaptive: boolean,\n+ safeAreaInsets: $Shape<EdgeInsets>,\n+ style: ViewStyleProp,\n+ |}>;\n+\n+ declare export type BottomTabBarButtonProps = {|\n+ ...$Diff<\n+ TouchableWithoutFeedbackProps,\n+ {| onPress?: ?(event: PressEvent) => mixed |},\n+ >,\n+ to?: string,\n+ children: React$Node,\n+ onPress?: (MouseEvent | PressEvent) => void,\n+ |};\n+\n+ //---------------------------------------------------------------------------\n+ // SECTION 4: EXPORTED MODULE\n+ // This is the only section that types exports. Other sections export types,\n+ // but this section types the module's exports.\n+ //---------------------------------------------------------------------------\n+\n+ declare export var BottomTabBar: React.ComponentType<{|\n+ state: TabNavigationState,\n+ navigation: BottomTabNavigationProp<>,\n+ descriptors: {| [key: string]: BottomTabDescriptor |},\n+ ...BottomTabBarOptions,\n+ |}>;\n+\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"diff": "@@ -372,7 +372,7 @@ declare module '@react-navigation/stack' {\ndelay?: number,\n};\n- // Copied from react-native/Libraries/Types/CoreEventTypes\n+ // Copied from react-native/Libraries/Types/CoreEventTypes.js\ndeclare type SyntheticEvent<T> = $ReadOnly<{|\nbubbles: ?boolean,\ncancelable: ?boolean,\n@@ -404,8 +404,54 @@ declare module '@react-navigation/stack' {\nlayout: Layout,\n|}>,\n>;\n+ declare type BlurEvent = SyntheticEvent<\n+ $ReadOnly<{|\n+ target: number,\n+ |}>,\n+ >;\n+ declare type FocusEvent = SyntheticEvent<\n+ $ReadOnly<{|\n+ target: number,\n+ |}>,\n+ >;\n+ declare type ResponderSyntheticEvent<T> = $ReadOnly<{|\n+ ...SyntheticEvent<T>,\n+ touchHistory: $ReadOnly<{|\n+ indexOfSingleActiveTouch: number,\n+ mostRecentTimeStamp: number,\n+ numberActiveTouches: number,\n+ touchBank: $ReadOnlyArray<\n+ $ReadOnly<{|\n+ touchActive: boolean,\n+ startPageX: number,\n+ startPageY: number,\n+ startTimeStamp: number,\n+ currentPageX: number,\n+ currentPageY: number,\n+ currentTimeStamp: number,\n+ previousPageX: number,\n+ previousPageY: number,\n+ previousTimeStamp: number,\n+ |}>,\n+ >,\n+ |}>,\n+ |}>;\n+ declare type PressEvent = ResponderSyntheticEvent<\n+ $ReadOnly<{|\n+ changedTouches: $ReadOnlyArray<$PropertyType<PressEvent, 'nativeEvent'>>,\n+ force: number,\n+ identifier: number,\n+ locationX: number,\n+ locationY: number,\n+ pageX: number,\n+ pageY: number,\n+ target: ?number,\n+ timestamp: number,\n+ touches: $ReadOnlyArray<$PropertyType<PressEvent, 'nativeEvent'>>,\n+ |}>,\n+ >;\n- // This is copied from\n+ // Copied from\n// react-native/Libraries/Animated/src/nodes/AnimatedInterpolation.js\ndeclare type ExtrapolateType = 'extend' | 'identity' | 'clamp';\ndeclare type InterpolationConfigType = {\n@@ -420,6 +466,97 @@ declare module '@react-navigation/stack' {\ninterpolate(config: InterpolationConfigType): AnimatedInterpolation;\n}\n+ // Copied from react-native/Libraries/Components/View/ViewAccessibility.js\n+ declare type AccessibilityRole =\n+ | 'none'\n+ | 'button'\n+ | 'link'\n+ | 'search'\n+ | 'image'\n+ | 'keyboardkey'\n+ | 'text'\n+ | 'adjustable'\n+ | 'imagebutton'\n+ | 'header'\n+ | 'summary'\n+ | 'alert'\n+ | 'checkbox'\n+ | 'combobox'\n+ | 'menu'\n+ | 'menubar'\n+ | 'menuitem'\n+ | 'progressbar'\n+ | 'radio'\n+ | 'radiogroup'\n+ | 'scrollbar'\n+ | 'spinbutton'\n+ | 'switch'\n+ | 'tab'\n+ | 'tablist'\n+ | 'timer'\n+ | 'toolbar';\n+ declare type AccessibilityActionInfo = $ReadOnly<{\n+ name: string,\n+ label?: string,\n+ ...\n+ }>;\n+ declare type AccessibilityActionEvent = SyntheticEvent<\n+ $ReadOnly<{actionName: string, ...}>,\n+ >;\n+ declare type AccessibilityState = {\n+ disabled?: boolean,\n+ selected?: boolean,\n+ checked?: ?boolean | 'mixed',\n+ busy?: boolean,\n+ expanded?: boolean,\n+ ...\n+ };\n+ declare type AccessibilityValue = $ReadOnly<{|\n+ min?: number,\n+ max?: number,\n+ now?: number,\n+ text?: string,\n+ |}>;\n+\n+ // Copied from\n+ // react-native/Libraries/Components/Touchable/TouchableWithoutFeedback.js\n+ declare type Stringish = string;\n+ declare type EdgeInsetsProp = $ReadOnly<$Shape<EdgeInsets>>;\n+ declare type TouchableWithoutFeedbackProps = $ReadOnly<{|\n+ accessibilityActions?: ?$ReadOnlyArray<AccessibilityActionInfo>,\n+ accessibilityElementsHidden?: ?boolean,\n+ accessibilityHint?: ?Stringish,\n+ accessibilityIgnoresInvertColors?: ?boolean,\n+ accessibilityLabel?: ?Stringish,\n+ accessibilityLiveRegion?: ?('none' | 'polite' | 'assertive'),\n+ accessibilityRole?: ?AccessibilityRole,\n+ accessibilityState?: ?AccessibilityState,\n+ accessibilityValue?: ?AccessibilityValue,\n+ accessibilityViewIsModal?: ?boolean,\n+ accessible?: ?boolean,\n+ children?: ?React$Node,\n+ delayLongPress?: ?number,\n+ delayPressIn?: ?number,\n+ delayPressOut?: ?number,\n+ disabled?: ?boolean,\n+ focusable?: ?boolean,\n+ hitSlop?: ?EdgeInsetsProp,\n+ importantForAccessibility?: ?('auto' | 'yes' | 'no' | 'no-hide-descendants'),\n+ nativeID?: ?string,\n+ onAccessibilityAction?: ?(event: AccessibilityActionEvent) => mixed,\n+ onBlur?: ?(event: BlurEvent) => mixed,\n+ onFocus?: ?(event: FocusEvent) => mixed,\n+ onLayout?: ?(event: LayoutEvent) => mixed,\n+ onLongPress?: ?(event: PressEvent) => mixed,\n+ onPress?: ?(event: PressEvent) => mixed,\n+ onPressIn?: ?(event: PressEvent) => mixed,\n+ onPressOut?: ?(event: PressEvent) => mixed,\n+ pressRetentionOffset?: ?EdgeInsetsProp,\n+ rejectResponderTermination?: ?boolean,\n+ testID?: ?string,\n+ touchSoundDisabled?: ?boolean,\n+ |}>;\n+\n/**\n* SECTION 2B\n* The following are the actually useful definitions in Section 2, that are\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/tab-bar.react.js",
"new_path": "native/navigation/tab-bar.react.js",
"diff": "@@ -115,4 +115,4 @@ const styles = StyleSheet.create({\n},\n});\n-export default props => <TabBar {...props} />;\n+export default (props: Props) => <TabBar {...props} />;\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Type React Nav BottomTabBar |
129,187 | 25.05.2020 17:33:29 | 14,400 | 7fdeeb7c1f08d22a8ff3c8afcd5f3598a54ff089 | [native] Split ParamLists out by navigator | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/route-names.js",
"new_path": "native/navigation/route-names.js",
"diff": "@@ -70,14 +70,7 @@ export const ThreadSettingsMemberTooltipModalRouteName =\n'ThreadSettingsMemberTooltipModal';\nexport const CameraModalRouteName = 'CameraModal';\n-export type TooltipModalParamList = {|\n- MultimediaTooltipModal: MultimediaTooltipModalParams,\n- TextMessageTooltipModal: TextMessageTooltipModalParams,\n- ThreadSettingsMemberTooltipModal: ThreadSettingsMemberTooltipModalParams,\n-|};\n-\n-export type ScreenParamList = {|\n- // Root navigator (login and modals)\n+export type RootParamList = {|\nLoggedOutModal: void,\nVerificationModal: VerificationModalParams,\nApp: void,\n@@ -86,23 +79,37 @@ export type ScreenParamList = {|\nCustomServerModal: CustomServerModalParams,\nColorPickerModal: ColorPickerModalParams,\nComposeSubthreadModal: ComposeSubthreadModalParams,\n- // Overlay navigator\n+|};\n+\n+export type TooltipModalParamList = {|\n+ MultimediaTooltipModal: MultimediaTooltipModalParams,\n+ TextMessageTooltipModal: TextMessageTooltipModalParams,\n+ ThreadSettingsMemberTooltipModal: ThreadSettingsMemberTooltipModalParams,\n+|};\n+\n+export type OverlayParamList = {|\nTabNavigator: void,\nMultimediaModal: MultimediaModalParams,\nActionResultModal: ActionResultModalParams,\nCameraModal: CameraModalParams,\n...TooltipModalParamList,\n- // Tab navigator\n+|};\n+\n+export type TabParamList = {|\nCalendar: void,\nChat: void,\nMore: void,\n- // Chat stack navigator\n+|};\n+\n+export type ChatParamList = {|\nChatThreadList: void,\nMessageList: MessageListParams,\nComposeThread: ComposeThreadParams,\nThreadSettings: ThreadSettingsParams,\nDeleteThread: DeleteThreadParams,\n- // More stack navigator\n+|};\n+\n+export type MoreParamList = {|\nMoreScreen: void,\nEditEmail: void,\nEditPassword: void,\n@@ -112,6 +119,14 @@ export type ScreenParamList = {|\nAppearancePreferences: void,\n|};\n+export type ScreenParamList = {|\n+ ...RootParamList,\n+ ...OverlayParamList,\n+ ...TabParamList,\n+ ...ChatParamList,\n+ ...MoreParamList,\n+|};\n+\nexport type NavigationRoute<RouteName: string> = {|\n...LeafRoute<RouteName>,\n+params: $ElementType<ScreenParamList, RouteName>,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Split ParamLists out by navigator |
129,187 | 25.05.2020 17:36:20 | 14,400 | bd76939cffc2b4670f339da89bf6d11a85ac1c7a | [native] Type createStackNavigator for React Nav | [
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"diff": "@@ -162,6 +162,27 @@ declare module '@react-navigation/bottom-tabs' {\n+blur: {| +data: void, +canPreventDefault: false |},\n+state: {| +data: {| state: State |}, +canPreventDefault: false |},\n|};\n+ declare type EventListenerCallback<\n+ EventName: string,\n+ State: NavigationState = NavigationState,\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ > = (e: EventArg<\n+ EventName,\n+ $PropertyType<\n+ $ElementType<\n+ {| ...EventMap, ...EventMapCore<State> |},\n+ EventName,\n+ >,\n+ 'canPreventDefault',\n+ >,\n+ $PropertyType<\n+ $ElementType<\n+ {| ...EventMap, ...EventMapCore<State> |},\n+ EventName,\n+ >,\n+ 'data',\n+ >,\n+ >) => mixed;\ndeclare export type SimpleNavigate<ParamList> =\n<DestinationRouteName: $Keys<ParamList>>(\n@@ -189,7 +210,7 @@ declare module '@react-navigation/bottom-tabs' {\nRouteName: $Keys<ParamList> = string,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\n- EventMap: EventMapBase = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n> = {\n+dispatch: (\naction:\n@@ -222,48 +243,179 @@ declare module '@react-navigation/bottom-tabs' {\n{| ...EventMap, ...EventMapCore<State> |},\n>>(\nname: EventName,\n- (e: EventArg<\n- EventName,\n- $PropertyType<\n- $ElementType<\n- {| ...EventMap, ...EventMapCore<State> |},\n- EventName,\n- >,\n- 'canPreventDefault',\n- >,\n- $PropertyType<\n- $ElementType<\n- {| ...EventMap, ...EventMapCore<State> |},\n- EventName,\n- >,\n- 'data',\n- >,\n- >) => mixed,\n+ callback: EventListenerCallback<EventName, State, EventMap>,\n) => () => void,\n+removeListener: <EventName: $Keys<\n{| ...EventMap, ...EventMapCore<State> |},\n>>(\nname: EventName,\n- (e: EventArg<\n- EventName,\n- $PropertyType<\n- $ElementType<\n- {| ...EventMap, ...EventMapCore<State> |},\n- EventName,\n+ callback: EventListenerCallback<EventName, State, EventMap>,\n+ ) => void,\n+ ...\n+ };\n+\n+ declare export type RouteProp<\n+ ParamList: ParamListBase,\n+ RouteName: $Keys<ParamList>,\n+ > = {|\n+ ...LeafRoute<RouteName>,\n+ +params: $ElementType<ParamList, RouteName>,\n+ |};\n+\n+ declare export type ScreenListeners<\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ State: NavigationState = NavigationState,\n+ > = $ObjMapi<\n+ {| [name: $Keys<EventMap>]: empty |},\n+ <K: $Keys<EventMap>>(K, empty) => EventListenerCallback<K, State, EventMap>,\n+ >;\n+\n+ declare type BaseScreenProps<\n+ GlobalParamList: ParamListBase,\n+ ParamList: ParamListBase = GlobalParamList,\n+ RouteName: $Keys<ParamList> = string,\n+ State: NavigationState = NavigationState,\n+ ScreenOptions: {} = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ > = {|\n+ name: RouteName,\n+ options?:\n+ | ScreenOptions\n+ | ({|\n+ route: RouteProp<ParamList, RouteName>,\n+ navigation: NavigationProp<\n+ GlobalParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n>,\n- 'canPreventDefault',\n+ |}) => ScreenOptions,\n+ listeners?:\n+ | ScreenListeners<EventMap, State>\n+ | ({|\n+ route: RouteProp<ParamList, RouteName>,\n+ navigation: NavigationProp<\n+ GlobalParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n>,\n- $PropertyType<\n- $ElementType<\n- {| ...EventMap, ...EventMapCore<State> |},\n- EventName,\n+ |}) => ScreenListeners<EventMap, State>,\n+ initialParams?: $Shape<$ElementType<ParamList, RouteName>>,\n+ |};\n+\n+ declare export type ScreenProps<\n+ GlobalParamList: ParamListBase,\n+ ParamList: ParamListBase = GlobalParamList,\n+ RouteName: $Keys<ParamList> = string,\n+ State: NavigationState = NavigationState,\n+ ScreenOptions: {} = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ > =\n+ | {|\n+ ...BaseScreenProps<\n+ GlobalParamList,\n+ ParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n>,\n- 'data',\n+ component: React$ComponentType<{|\n+ route: RouteProp<ParamList, RouteName>,\n+ navigation: NavigationProp<\n+ GlobalParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n>,\n- >) => mixed,\n- ) => void,\n+ |}>,\n+ |}\n+ | {|\n+ ...BaseScreenProps<\n+ GlobalParamList,\n+ ParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n+ >,\n+ children: ({|\n+ route: RouteProp<ParamList, RouteName>,\n+ navigation: NavigationProp<\n+ GlobalParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n+ >,\n+ |}) => React$Node,\n+ |};\n+\n+ declare export type ScreenComponent<\n+ GlobalParamList: ParamListBase,\n+ ParamList: ParamListBase = GlobalParamList,\n+ State: NavigationState = NavigationState,\n+ ScreenOptions: {} = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ > = <RouteName: $Keys<ParamList>>(props: ScreenProps<\n+ GlobalParamList,\n+ ParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n+ >) => React$Node;\n+\n+ declare export type NavigatorComponent<\n+ GlobalParamList: ParamListBase,\n+ ParamList: ParamListBase = GlobalParamList,\n+ State: NavigationState = NavigationState,\n+ ScreenOptions: {} = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ > = React$ComponentType<{\n+ initialRouteName?: $Keys<ParamList>,\n+ screenOptions?:\n+ | ScreenOptions\n+ | ({|\n+ route: RouteProp<ParamList, $Keys<ParamList>>,\n+ navigation: NavigationProp<\n+ GlobalParamList,\n+ $Keys<ParamList>,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n+ >,\n+ |}) => ScreenOptions,\n...\n- };\n+ }>;\n+\n+ declare export type CreateNavigator<\n+ State: NavigationState = NavigationState,\n+ ScreenOptions: {} = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ > = <\n+ GlobalParamList: ParamListBase,\n+ ParamList: ParamListBase = GlobalParamList,\n+ >() => {|\n+ Screen: ScreenComponent<\n+ GlobalParamList,\n+ ParamList,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n+ >,\n+ Navigator: NavigatorComponent<\n+ GlobalParamList,\n+ ParamList,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n+ >,\n+ |};\n//---------------------------------------------------------------------------\n// SECTION 2: SHARED TYPE DEFINITIONS\n@@ -568,7 +720,7 @@ declare module '@react-navigation/bottom-tabs' {\nRouteName: $Keys<ParamList> = string,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\n- EventMap: EventMapBase = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n> = {|\n+render: () => React$Node,\n+options: $ReadOnly<ScreenOptions>,\n@@ -689,7 +841,7 @@ declare module '@react-navigation/bottom-tabs' {\n// but this section types the module's exports.\n//---------------------------------------------------------------------------\n- declare export var BottomTabBar: React.ComponentType<{|\n+ declare export var BottomTabBar: React$ComponentType<{|\nstate: TabNavigationState,\nnavigation: BottomTabNavigationProp<>,\ndescriptors: {| [key: string]: BottomTabDescriptor |},\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"diff": "@@ -162,6 +162,27 @@ declare module '@react-navigation/native' {\n+blur: {| +data: void, +canPreventDefault: false |},\n+state: {| +data: {| state: State |}, +canPreventDefault: false |},\n|};\n+ declare type EventListenerCallback<\n+ EventName: string,\n+ State: NavigationState = NavigationState,\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ > = (e: EventArg<\n+ EventName,\n+ $PropertyType<\n+ $ElementType<\n+ {| ...EventMap, ...EventMapCore<State> |},\n+ EventName,\n+ >,\n+ 'canPreventDefault',\n+ >,\n+ $PropertyType<\n+ $ElementType<\n+ {| ...EventMap, ...EventMapCore<State> |},\n+ EventName,\n+ >,\n+ 'data',\n+ >,\n+ >) => mixed;\ndeclare export type SimpleNavigate<ParamList> =\n<DestinationRouteName: $Keys<ParamList>>(\n@@ -189,7 +210,7 @@ declare module '@react-navigation/native' {\nRouteName: $Keys<ParamList> = string,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\n- EventMap: EventMapBase = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n> = {\n+dispatch: (\naction:\n@@ -222,48 +243,179 @@ declare module '@react-navigation/native' {\n{| ...EventMap, ...EventMapCore<State> |},\n>>(\nname: EventName,\n- (e: EventArg<\n- EventName,\n- $PropertyType<\n- $ElementType<\n- {| ...EventMap, ...EventMapCore<State> |},\n- EventName,\n- >,\n- 'canPreventDefault',\n- >,\n- $PropertyType<\n- $ElementType<\n- {| ...EventMap, ...EventMapCore<State> |},\n- EventName,\n- >,\n- 'data',\n- >,\n- >) => mixed,\n+ callback: EventListenerCallback<EventName, State, EventMap>,\n) => () => void,\n+removeListener: <EventName: $Keys<\n{| ...EventMap, ...EventMapCore<State> |},\n>>(\nname: EventName,\n- (e: EventArg<\n- EventName,\n- $PropertyType<\n- $ElementType<\n- {| ...EventMap, ...EventMapCore<State> |},\n- EventName,\n+ callback: EventListenerCallback<EventName, State, EventMap>,\n+ ) => void,\n+ ...\n+ };\n+\n+ declare export type RouteProp<\n+ ParamList: ParamListBase,\n+ RouteName: $Keys<ParamList>,\n+ > = {|\n+ ...LeafRoute<RouteName>,\n+ +params: $ElementType<ParamList, RouteName>,\n+ |};\n+\n+ declare export type ScreenListeners<\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ State: NavigationState = NavigationState,\n+ > = $ObjMapi<\n+ {| [name: $Keys<EventMap>]: empty |},\n+ <K: $Keys<EventMap>>(K, empty) => EventListenerCallback<K, State, EventMap>,\n+ >;\n+\n+ declare type BaseScreenProps<\n+ GlobalParamList: ParamListBase,\n+ ParamList: ParamListBase = GlobalParamList,\n+ RouteName: $Keys<ParamList> = string,\n+ State: NavigationState = NavigationState,\n+ ScreenOptions: {} = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ > = {|\n+ name: RouteName,\n+ options?:\n+ | ScreenOptions\n+ | ({|\n+ route: RouteProp<ParamList, RouteName>,\n+ navigation: NavigationProp<\n+ GlobalParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n>,\n- 'canPreventDefault',\n+ |}) => ScreenOptions,\n+ listeners?:\n+ | ScreenListeners<EventMap, State>\n+ | ({|\n+ route: RouteProp<ParamList, RouteName>,\n+ navigation: NavigationProp<\n+ GlobalParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n>,\n- $PropertyType<\n- $ElementType<\n- {| ...EventMap, ...EventMapCore<State> |},\n- EventName,\n+ |}) => ScreenListeners<EventMap, State>,\n+ initialParams?: $Shape<$ElementType<ParamList, RouteName>>,\n+ |};\n+\n+ declare export type ScreenProps<\n+ GlobalParamList: ParamListBase,\n+ ParamList: ParamListBase = GlobalParamList,\n+ RouteName: $Keys<ParamList> = string,\n+ State: NavigationState = NavigationState,\n+ ScreenOptions: {} = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ > =\n+ | {|\n+ ...BaseScreenProps<\n+ GlobalParamList,\n+ ParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n>,\n- 'data',\n+ component: React$ComponentType<{|\n+ route: RouteProp<ParamList, RouteName>,\n+ navigation: NavigationProp<\n+ GlobalParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n>,\n- >) => mixed,\n- ) => void,\n+ |}>,\n+ |}\n+ | {|\n+ ...BaseScreenProps<\n+ GlobalParamList,\n+ ParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n+ >,\n+ children: ({|\n+ route: RouteProp<ParamList, RouteName>,\n+ navigation: NavigationProp<\n+ GlobalParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n+ >,\n+ |}) => React$Node,\n+ |};\n+\n+ declare export type ScreenComponent<\n+ GlobalParamList: ParamListBase,\n+ ParamList: ParamListBase = GlobalParamList,\n+ State: NavigationState = NavigationState,\n+ ScreenOptions: {} = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ > = <RouteName: $Keys<ParamList>>(props: ScreenProps<\n+ GlobalParamList,\n+ ParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n+ >) => React$Node;\n+\n+ declare export type NavigatorComponent<\n+ GlobalParamList: ParamListBase,\n+ ParamList: ParamListBase = GlobalParamList,\n+ State: NavigationState = NavigationState,\n+ ScreenOptions: {} = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ > = React$ComponentType<{\n+ initialRouteName?: $Keys<ParamList>,\n+ screenOptions?:\n+ | ScreenOptions\n+ | ({|\n+ route: RouteProp<ParamList, $Keys<ParamList>>,\n+ navigation: NavigationProp<\n+ GlobalParamList,\n+ $Keys<ParamList>,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n+ >,\n+ |}) => ScreenOptions,\n...\n- };\n+ }>;\n+\n+ declare export type CreateNavigator<\n+ State: NavigationState = NavigationState,\n+ ScreenOptions: {} = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ > = <\n+ GlobalParamList: ParamListBase,\n+ ParamList: ParamListBase = GlobalParamList,\n+ >() => {|\n+ Screen: ScreenComponent<\n+ GlobalParamList,\n+ ParamList,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n+ >,\n+ Navigator: NavigatorComponent<\n+ GlobalParamList,\n+ ParamList,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n+ >,\n+ |};\n//---------------------------------------------------------------------------\n// SECTION 2: SHARED TYPE DEFINITIONS\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"diff": "@@ -162,6 +162,27 @@ declare module '@react-navigation/stack' {\n+blur: {| +data: void, +canPreventDefault: false |},\n+state: {| +data: {| state: State |}, +canPreventDefault: false |},\n|};\n+ declare type EventListenerCallback<\n+ EventName: string,\n+ State: NavigationState = NavigationState,\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ > = (e: EventArg<\n+ EventName,\n+ $PropertyType<\n+ $ElementType<\n+ {| ...EventMap, ...EventMapCore<State> |},\n+ EventName,\n+ >,\n+ 'canPreventDefault',\n+ >,\n+ $PropertyType<\n+ $ElementType<\n+ {| ...EventMap, ...EventMapCore<State> |},\n+ EventName,\n+ >,\n+ 'data',\n+ >,\n+ >) => mixed;\ndeclare export type SimpleNavigate<ParamList> =\n<DestinationRouteName: $Keys<ParamList>>(\n@@ -189,7 +210,7 @@ declare module '@react-navigation/stack' {\nRouteName: $Keys<ParamList> = string,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\n- EventMap: EventMapBase = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n> = {\n+dispatch: (\naction:\n@@ -222,48 +243,179 @@ declare module '@react-navigation/stack' {\n{| ...EventMap, ...EventMapCore<State> |},\n>>(\nname: EventName,\n- (e: EventArg<\n- EventName,\n- $PropertyType<\n- $ElementType<\n- {| ...EventMap, ...EventMapCore<State> |},\n- EventName,\n- >,\n- 'canPreventDefault',\n- >,\n- $PropertyType<\n- $ElementType<\n- {| ...EventMap, ...EventMapCore<State> |},\n- EventName,\n- >,\n- 'data',\n- >,\n- >) => mixed,\n+ callback: EventListenerCallback<EventName, State, EventMap>,\n) => () => void,\n+removeListener: <EventName: $Keys<\n{| ...EventMap, ...EventMapCore<State> |},\n>>(\nname: EventName,\n- (e: EventArg<\n- EventName,\n- $PropertyType<\n- $ElementType<\n- {| ...EventMap, ...EventMapCore<State> |},\n- EventName,\n+ callback: EventListenerCallback<EventName, State, EventMap>,\n+ ) => void,\n+ ...\n+ };\n+\n+ declare export type RouteProp<\n+ ParamList: ParamListBase,\n+ RouteName: $Keys<ParamList>,\n+ > = {|\n+ ...LeafRoute<RouteName>,\n+ +params: $ElementType<ParamList, RouteName>,\n+ |};\n+\n+ declare export type ScreenListeners<\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ State: NavigationState = NavigationState,\n+ > = $ObjMapi<\n+ {| [name: $Keys<EventMap>]: empty |},\n+ <K: $Keys<EventMap>>(K, empty) => EventListenerCallback<K, State, EventMap>,\n+ >;\n+\n+ declare type BaseScreenProps<\n+ GlobalParamList: ParamListBase,\n+ ParamList: ParamListBase = GlobalParamList,\n+ RouteName: $Keys<ParamList> = string,\n+ State: NavigationState = NavigationState,\n+ ScreenOptions: {} = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ > = {|\n+ name: RouteName,\n+ options?:\n+ | ScreenOptions\n+ | ({|\n+ route: RouteProp<ParamList, RouteName>,\n+ navigation: NavigationProp<\n+ GlobalParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n>,\n- 'canPreventDefault',\n+ |}) => ScreenOptions,\n+ listeners?:\n+ | ScreenListeners<EventMap, State>\n+ | ({|\n+ route: RouteProp<ParamList, RouteName>,\n+ navigation: NavigationProp<\n+ GlobalParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n>,\n- $PropertyType<\n- $ElementType<\n- {| ...EventMap, ...EventMapCore<State> |},\n- EventName,\n+ |}) => ScreenListeners<EventMap, State>,\n+ initialParams?: $Shape<$ElementType<ParamList, RouteName>>,\n+ |};\n+\n+ declare export type ScreenProps<\n+ GlobalParamList: ParamListBase,\n+ ParamList: ParamListBase = GlobalParamList,\n+ RouteName: $Keys<ParamList> = string,\n+ State: NavigationState = NavigationState,\n+ ScreenOptions: {} = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ > =\n+ | {|\n+ ...BaseScreenProps<\n+ GlobalParamList,\n+ ParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n>,\n- 'data',\n+ component: React$ComponentType<{|\n+ route: RouteProp<ParamList, RouteName>,\n+ navigation: NavigationProp<\n+ GlobalParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n>,\n- >) => mixed,\n- ) => void,\n+ |}>,\n+ |}\n+ | {|\n+ ...BaseScreenProps<\n+ GlobalParamList,\n+ ParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n+ >,\n+ children: ({|\n+ route: RouteProp<ParamList, RouteName>,\n+ navigation: NavigationProp<\n+ GlobalParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n+ >,\n+ |}) => React$Node,\n+ |};\n+\n+ declare export type ScreenComponent<\n+ GlobalParamList: ParamListBase,\n+ ParamList: ParamListBase = GlobalParamList,\n+ State: NavigationState = NavigationState,\n+ ScreenOptions: {} = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ > = <RouteName: $Keys<ParamList>>(props: ScreenProps<\n+ GlobalParamList,\n+ ParamList,\n+ RouteName,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n+ >) => React$Node;\n+\n+ declare export type NavigatorComponent<\n+ GlobalParamList: ParamListBase,\n+ ParamList: ParamListBase = GlobalParamList,\n+ State: NavigationState = NavigationState,\n+ ScreenOptions: {} = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ > = React$ComponentType<{\n+ initialRouteName?: $Keys<ParamList>,\n+ screenOptions?:\n+ | ScreenOptions\n+ | ({|\n+ route: RouteProp<ParamList, $Keys<ParamList>>,\n+ navigation: NavigationProp<\n+ GlobalParamList,\n+ $Keys<ParamList>,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n+ >,\n+ |}) => ScreenOptions,\n...\n- };\n+ }>;\n+\n+ declare export type CreateNavigator<\n+ State: NavigationState = NavigationState,\n+ ScreenOptions: {} = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ > = <\n+ GlobalParamList: ParamListBase,\n+ ParamList: ParamListBase = GlobalParamList,\n+ >() => {|\n+ Screen: ScreenComponent<\n+ GlobalParamList,\n+ ParamList,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n+ >,\n+ Navigator: NavigatorComponent<\n+ GlobalParamList,\n+ ParamList,\n+ State,\n+ ScreenOptions,\n+ EventMap,\n+ >,\n+ |};\n//---------------------------------------------------------------------------\n// SECTION 2: SHARED TYPE DEFINITIONS\n@@ -568,7 +720,7 @@ declare module '@react-navigation/stack' {\nRouteName: $Keys<ParamList> = string,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\n- EventMap: EventMapBase = {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n> = {|\n+render: () => React$Node,\n+options: $ReadOnly<ScreenOptions>,\n@@ -845,7 +997,7 @@ declare module '@react-navigation/stack' {\n// but this section types the module's exports.\n//---------------------------------------------------------------------------\n- declare export var StackView: React.ComponentType<{|\n+ declare export var StackView: React$ComponentType<{|\nmode?: 'card' | 'modal',\nheaderMode?: 'float' | 'screen' | 'none',\nkeyboardHandlingEnabled?: boolean,\n@@ -854,4 +1006,10 @@ declare module '@react-navigation/stack' {\ndescriptors: {| [key: string]: StackDescriptor |},\n|}>;\n+ declare export var createStackNavigator: CreateNavigator<\n+ StackNavigationState,\n+ StackOptions,\n+ StackNavigationEventMap,\n+ >;\n+\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/more/more.react.js",
"new_path": "native/more/more.react.js",
"diff": "@@ -20,7 +20,9 @@ import {\nBuildInfoRouteName,\nDevToolsRouteName,\nAppearancePreferencesRouteName,\n+ VerificationModalRouteName,\ntype ScreenParamList,\n+ type MoreParamList,\n} from '../navigation/route-names';\nimport MoreHeader from './more-header.react';\nimport HeaderBackButton from '../navigation/header-back-button.react';\n@@ -44,7 +46,7 @@ export type MoreNavigationProp<RouteName: string> = StackNavigationProp<\nRouteName,\n>;\n-const More = createStackNavigator();\n+const More = createStackNavigator<ScreenParamList, MoreParamList>();\nexport default () => (\n<More.Navigator screenOptions={screenOptions}>\n<More.Screen\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Type createStackNavigator for React Nav |
129,187 | 25.05.2020 17:44:26 | 14,400 | 1b029844d08e836a7c5d2e11bd38bf7fc45e9f89 | [native] Type createBottomTabNavigator for React Nav | [
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"diff": "@@ -841,6 +841,12 @@ declare module '@react-navigation/bottom-tabs' {\n// but this section types the module's exports.\n//---------------------------------------------------------------------------\n+ declare export var createBottomTabNavigator: CreateNavigator<\n+ TabNavigationState,\n+ BottomTabNavigationOptions,\n+ BottomTabNavigationEventMap,\n+ >;\n+\ndeclare export var BottomTabBar: React$ComponentType<{|\nstate: TabNavigationState,\nnavigation: BottomTabNavigationProp<>,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/app-navigator.react.js",
"new_path": "native/navigation/app-navigator.react.js",
"diff": "@@ -23,6 +23,7 @@ import {\nThreadSettingsMemberTooltipModalRouteName,\nCameraModalRouteName,\ntype ScreenParamList,\n+ type TabParamList,\n} from './route-names';\nimport Calendar from '../calendar/calendar.react';\nimport Chat from '../chat/chat.react';\n@@ -69,7 +70,7 @@ export type TabNavigationProp<RouteName: string> = BottomTabNavigationProp<\nRouteName,\n>;\n-const Tab = createBottomTabNavigator();\n+const Tab = createBottomTabNavigator<ScreenParamList, TabParamList>();\nconst tabBarOptions = { keyboardHidesTabBar: false };\nfunction TabNavigator() {\nreturn (\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Type createBottomTabNavigator for React Nav |
129,187 | 25.05.2020 20:16:41 | 14,400 | 1bebf8b89d0e559d15b567309324ff51a8ba098f | [native] Clean up NavigationProp types | [
{
"change_type": "MODIFY",
"old_path": "native/chat/chat-router.js",
"new_path": "native/chat/chat-router.js",
"diff": "@@ -62,13 +62,13 @@ export type ChatRouterNavigationAction =\nexport type ChatRouterNavigationProp<\nParamList: ParamListBase,\nRouteName: string,\n-> = {|\n+> = $ReadOnly<{|\n...StackNavigationProp<ParamList, RouteName>,\n+clearScreens: (routeNames: $ReadOnlyArray<string>) => void,\n+replaceWithThread: (threadInfo: ThreadInfo) => void,\n+clearThreads: (threadIDs: $ReadOnlyArray<string>) => void,\n+pushNewThread: (threadInfo: ThreadInfo) => void,\n-|};\n+|}>;\nfunction ChatRouter(options: StackOptions) {\nconst stackRouter = StackRouter(options);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"diff": "@@ -377,6 +377,7 @@ declare module '@react-navigation/bottom-tabs' {\nScreenOptions: {} = {},\nEventMap: EventMapBase = EventMapCore<State>,\n> = React$ComponentType<{\n+ children?: React.Node,\ninitialRouteName?: $Keys<ParamList>,\nscreenOptions?:\n| ScreenOptions\n@@ -778,7 +779,8 @@ declare module '@react-navigation/bottom-tabs' {\nunmountOnBlur: boolean,\n|}>;\n- declare type BottomTabNavigationEventMap = {|\n+ declare export type BottomTabNavigationEventMap = {|\n+ ...EventMapCore<TabNavigationState>,\n+tabPress: {| +data: void, +canPreventDefault: true |},\n+tabLongPress: {| +data: void, +canPreventDefault: false |},\n|};\n@@ -786,20 +788,22 @@ declare module '@react-navigation/bottom-tabs' {\ndeclare export type BottomTabNavigationProp<\nParamList: ParamListBase = ParamListBase,\nRouteName: $Keys<ParamList> = string,\n- > = {|\n+ Options: {} = BottomTabNavigationOptions,\n+ EventMap: EventMapBase = BottomTabNavigationEventMap,\n+ > = $ReadOnly<{|\n...$Exact<NavigationProp<\nParamList,\nRouteName,\nTabNavigationState,\n- BottomTabNavigationOptions,\n- BottomTabNavigationEventMap,\n+ Options,\n+ EventMap,\n>>,\n+jumpTo: SimpleNavigate<$If<\n$IsExact<ParamList>,\nParamList,\n{ ...ParamListBase, ...ParamList },\n>>,\n- |};\n+ |}>;\ndeclare export type BottomTabDescriptor = Descriptor<\nParamListBase,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"diff": "@@ -377,6 +377,7 @@ declare module '@react-navigation/native' {\nScreenOptions: {} = {},\nEventMap: EventMapBase = EventMapCore<State>,\n> = React$ComponentType<{\n+ children?: React.Node,\ninitialRouteName?: $Keys<ParamList>,\nscreenOptions?:\n| ScreenOptions\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"diff": "@@ -377,6 +377,7 @@ declare module '@react-navigation/stack' {\nScreenOptions: {} = {},\nEventMap: EventMapBase = EventMapCore<State>,\n> = React$ComponentType<{\n+ children?: React.Node,\ninitialRouteName?: $Keys<ParamList>,\nscreenOptions?:\n| ScreenOptions\n@@ -858,7 +859,8 @@ declare module '@react-navigation/stack' {\nheaderStatusBarHeight: number,\n|}>;\n- declare type StackNavigationEventMap = {|\n+ declare export type StackNavigationEventMap = {|\n+ ...EventMapCore<StackNavigationState>,\n+transitionStart: {|\n+data: {| closing: boolean |},\n+canPreventDefault: false,\n@@ -872,13 +874,15 @@ declare module '@react-navigation/stack' {\ndeclare export type StackNavigationProp<\nParamList: ParamListBase = ParamListBase,\nRouteName: $Keys<ParamList> = string,\n- > = {|\n+ Options: {} = StackOptions,\n+ EventMap: EventMapBase = StackNavigationEventMap,\n+ > = $ReadOnly<{|\n...$Exact<NavigationProp<\nParamList,\nRouteName,\nStackNavigationState,\n- StackOptions,\n- StackNavigationEventMap,\n+ Options,\n+ EventMap,\n>>,\n+replace: SimpleNavigate<$If<\n$IsExact<ParamList>,\n@@ -892,7 +896,7 @@ declare module '@react-navigation/stack' {\n>>,\n+pop: (count?: number) => void,\n+popToTop: () => void,\n- |};\n+ |}>;\ndeclare export type StackHeaderLeftButtonProps = {|\nonPress: ?(() => void),\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-router.js",
"new_path": "native/navigation/overlay-router.js",
"diff": "@@ -26,10 +26,10 @@ export type OverlayRouterNavigationAction =\nexport type OverlayRouterNavigationProp<\nParamList: ParamListBase,\nRouteName: string,\n-> = {|\n- ...StackNavigationProp<ParamList, RouteName>,\n+> = $ReadOnly<{|\n+ ...StackNavigationProp<ParamList, RouteName, {||}, {||}>,\n+clearOverlayModals: (keys: $ReadOnlyArray<string>) => void,\n-|};\n+|}>;\nfunction OverlayRouter(options: StackOptions) {\nconst stackRouter = StackRouter(options);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/root-router.js",
"new_path": "native/navigation/root-router.js",
"diff": "@@ -56,13 +56,13 @@ export type RootRouterNavigationAction =\nexport type RootRouterNavigationProp<\nParamList: ParamListBase,\nRouteName: string,\n-> = {|\n+> = $ReadOnly<{|\n...StackNavigationProp<ParamList, RouteName>,\n+logIn: () => void,\n+logOut: () => void,\n+clearRootModals: (keys: $ReadOnlyArray<string>) => void,\n+setNavState: (state: NavigationState) => void,\n-|};\n+|}>;\nfunction resetState(\nnewPartialRoute: PossiblyStaleRoute<>,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Clean up NavigationProp types |
129,187 | 25.05.2020 20:18:14 | 14,400 | 7c8ef5eef00ced90c93f5e363eec0ba65f35ce2b | [native] Any-type remaining surface of React Nav
Have to prepare for Dominik and co :) | [
{
"change_type": "ADD",
"old_path": null,
"new_path": "native/flow-typed/npm/@react-navigation/core_vx.x.x.js",
"diff": "+// flow-typed signature: 94dd82daa3bb1555a1a4ad5287cf08ff\n+// flow-typed version: <<STUB>>/@react-navigation/core_v5.5.2/flow_v0.105.0\n+\n+/**\n+ * This is an autogenerated libdef stub for:\n+ *\n+ * '@react-navigation/core'\n+ *\n+ * Fill this stub out by replacing all the `any` types.\n+ *\n+ * Once filled out, we encourage you to share your work with the\n+ * community by sending a pull request to:\n+ * https://github.com/flowtype/flow-typed\n+ */\n+\n+/**\n+ * We include stubs for each file inside this npm package in case you need to\n+ * require those files directly. Feel free to delete any files that aren't\n+ * needed.\n+ */\n+declare module '@react-navigation/core/src/NavigationBuilderContext' {\n+ declare module.exports: any;\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"diff": "@@ -464,4 +464,12 @@ declare module '@react-navigation/native' {\nsetParams: (params: ScreenParams) => SetParamsAction,\n|};\n+ declare export var StackRouter: any;\n+ declare export var useNavigationBuilder: any;\n+ declare export var createNavigatorFactory: any;\n+ declare export var NavigationHelpersContext: any;\n+ declare export var NavigationContainer: any;\n+ declare export var DefaultTheme: any;\n+ declare export var DarkTheme: any;\n+\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"diff": "@@ -1010,10 +1010,14 @@ declare module '@react-navigation/stack' {\ndescriptors: {| [key: string]: StackDescriptor |},\n|}>;\n+ declare export var HeaderTitle: any;\ndeclare export var createStackNavigator: CreateNavigator<\nStackNavigationState,\nStackOptions,\nStackNavigationEventMap,\n>;\n+ declare export var HeaderBackButton: any;\n+ declare export var Header: any;\n+ declare export var TransitionPresets: any;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-navigator.react.js",
"new_path": "native/navigation/overlay-navigator.react.js",
"diff": "@@ -20,7 +20,7 @@ import { scrollBlockingChatModals } from './route-names';\nconst { Value, timing, cond, call, lessOrEq, block } = Animated;\n/* eslint-enable import/no-named-as-default-member */\n-const OverlayNavigator = React.memo<Props>(({\n+const OverlayNavigator = React.memo<any>(({\ninitialRouteName,\nchildren,\nscreenOptions,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Any-type remaining surface of React Nav
Have to prepare for Dominik and co :) |
129,187 | 26.05.2020 00:43:33 | 14,400 | d97710a0839bf06e8758728025d96e2ffaf4f447 | [server] create-db.js | [
{
"change_type": "MODIFY",
"old_path": "server/src/creators/role-creator.js",
"new_path": "server/src/creators/role-creator.js",
"diff": "@@ -186,4 +186,4 @@ function getRolePermissionBlobsForChat(): RolePermissionBlobs {\n};\n}\n-export default createInitialRolesForNewThread;\n+export { createInitialRolesForNewThread, getRolePermissionBlobsForChat };\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/thread-creator.js",
"new_path": "server/src/creators/thread-creator.js",
"diff": "@@ -15,7 +15,7 @@ import { ServerError } from 'lib/utils/errors';\nimport { dbQuery, SQL } from '../database';\nimport { checkThreadPermission } from '../fetchers/thread-fetchers';\nimport createIDs from './id-creator';\n-import createInitialRolesForNewThread from './role-creator';\n+import { createInitialRolesForNewThread } from './role-creator';\nimport { verifyUserIDs } from '../fetchers/user-fetchers';\nimport {\nchangeRole,\n"
},
{
"change_type": "RENAME",
"old_path": "server/src/scripts/create-tables.js",
"new_path": "server/src/scripts/create-db.js",
"diff": "import { setScriptContext } from './script-context';\nimport { endScript } from './utils';\nimport { dbQuery, SQL } from '../database';\n+import { getRolePermissionBlobsForChat } from '../creators/role-creator';\nsetScriptContext({\nallowMultiStatementSQLQueries: true,\n@@ -11,6 +12,8 @@ setScriptContext({\nasync function main() {\ntry {\nawait createTables();\n+ await createUsers();\n+ await createThreads();\nendScript();\n} catch (e) {\nendScript();\n@@ -275,4 +278,32 @@ async function createTables() {\n`);\n}\n+async function createUsers() {\n+ await dbQuery(SQL`\n+ INSERT INTO ids (id, table_name)\n+ VALUES (5, 'users'), (256, 'users');\n+ INSERT INTO users (id, username, hash, email, email_verified, avatar,\n+ creation_time)\n+ VALUES\n+ (5, 'squadbot', '', 'squadbot@squadcal.org', 1, NULL, 1530049900980),\n+ (256, 'ashoat', '', 'ashoat@gmail.com', 1, NULL, 1463588881886);\n+ `);\n+}\n+\n+async function createThreads() {\n+ const ashoatSquadbotThreadDefaultRolePermissions = JSON.stringify(\n+ getRolePermissionBlobsForChat().defaultPermissions,\n+ );\n+ await dbQuery(SQL`\n+ INSERT INTO ids (id, table_name)\n+ VALUES (83794, 'threads'), (118821, 'roles');\n+ INSERT INTO roles (id, thread, name, permissions, creation_time)\n+ VALUES (118821, 83794, 'Members',\n+ ${ashoatSquadbotThreadDefaultRolePermissions}, 1530049901882);\n+ INSERT INTO threads (id, type, name, description, parent_thread_id,\n+ default_role, creator, creation_time, color)\n+ VALUES (83794, 4, NULL, NULL, NULL, 118821, 5, 1530049901942, 'ef1a63');\n+ `);\n+}\n+\nmain();\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [server] create-db.js |
129,187 | 26.05.2020 17:45:50 | 14,400 | 4dd78b25f04badfa7b70b616b234177ee6c73e3f | [native] Fix up CreateNavigator to work across the app and with custom navigators
Had to any-type nav prop unfortunately... | [
{
"change_type": "MODIFY",
"old_path": "native/chat/chat-router.js",
"new_path": "native/chat/chat-router.js",
"diff": "@@ -61,13 +61,13 @@ export type ChatRouterNavigationAction =\nexport type ChatRouterNavigationProp<\nParamList: ParamListBase,\nRouteName: string,\n-> = $ReadOnly<{|\n+> = {|\n...StackNavigationProp<ParamList, RouteName>,\n+clearScreens: (routeNames: $ReadOnlyArray<string>) => void,\n+replaceWithThread: (threadInfo: ThreadInfo) => void,\n+clearThreads: (threadIDs: $ReadOnlyArray<string>) => void,\n+pushNewThread: (threadInfo: ThreadInfo) => void,\n-|}>;\n+|};\nfunction ChatRouter(routerOptions: StackOptions) {\nconst stackRouter = StackRouter(routerOptions);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/chat.react.js",
"new_path": "native/chat/chat.react.js",
"diff": "@@ -5,7 +5,12 @@ import {\ncreateNavigatorFactory,\nuseNavigationBuilder,\n} from '@react-navigation/native';\n-import { StackView } from '@react-navigation/stack';\n+import {\n+ StackView,\n+ type StackNavigationState,\n+ type StackOptions,\n+ type StackNavigationEventMap,\n+} from '@react-navigation/stack';\nimport { Platform, StyleSheet } from 'react-native';\nimport invariant from 'invariant';\n@@ -21,6 +26,7 @@ import {\nMessageListRouteName,\nChatThreadListRouteName,\ntype ScreenParamList,\n+ type ChatParamList,\n} from '../navigation/route-names';\nimport HeaderBackButton from '../navigation/header-back-button.react';\nimport ChatHeader from './chat-header.react';\n@@ -64,7 +70,11 @@ function ChatNavigator({ initialRouteName, children, screenOptions, ...rest }) {\n/>\n);\n}\n-const createChatNavigator = createNavigatorFactory(ChatNavigator);\n+const createChatNavigator = createNavigatorFactory<\n+ StackNavigationState,\n+ StackOptions,\n+ StackNavigationEventMap,\n+>(ChatNavigator);\nconst header = props => <ChatHeader {...props} />;\nconst headerBackButton = props => <HeaderBackButton {...props} />;\n@@ -78,7 +88,7 @@ const chatThreadListOptions = ({ navigation }) => ({\nheaderRight:\nPlatform.OS === 'ios'\n? () => <ComposeThreadButton navigate={navigation.navigate} />\n- : null,\n+ : undefined,\nheaderBackTitle: 'Back',\n});\nconst messageListOptions = ({ navigation, route }) => ({\n@@ -104,7 +114,7 @@ const messageListOptions = ({ navigation, route }) => ({\nnavigate={navigation.navigate}\n/>\n)\n- : null,\n+ : undefined,\nheaderBackTitle: 'Back',\n});\nconst composeThreadOptions = {\n@@ -126,12 +136,11 @@ const styles = StyleSheet.create({\n},\n});\n-export type ChatNavigationProp<RouteName: string> = ChatRouterNavigationProp<\n- ScreenParamList,\n- RouteName,\n->;\n+export type ChatNavigationProp<\n+ RouteName: $Keys<ChatParamList> = $Keys<ChatParamList>,\n+> = ChatRouterNavigationProp<ScreenParamList, RouteName>;\n-const Chat = createChatNavigator();\n+const Chat = createChatNavigator<ChatParamList>();\nconst ChatComponent = () => (\n<KeyboardAvoidingView style={styles.keyboardAvoidingView}>\n<Chat.Navigator screenOptions={screenOptions}>\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"diff": "@@ -271,8 +271,7 @@ declare module '@react-navigation/bottom-tabs' {\n>;\ndeclare type BaseScreenProps<\n- GlobalParamList: ParamListBase,\n- ParamList: ParamListBase = GlobalParamList,\n+ ParamList: ParamListBase,\nRouteName: $Keys<ParamList> = string,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\n@@ -283,32 +282,19 @@ declare module '@react-navigation/bottom-tabs' {\n| ScreenOptions\n| ({|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: NavigationProp<\n- GlobalParamList,\n- RouteName,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n+ navigation: any,\n|}) => ScreenOptions,\nlisteners?:\n| ScreenListeners<EventMap, State>\n| ({|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: NavigationProp<\n- GlobalParamList,\n- RouteName,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n+ navigation: any,\n|}) => ScreenListeners<EventMap, State>,\ninitialParams?: $Shape<$ElementType<ParamList, RouteName>>,\n|};\ndeclare export type ScreenProps<\n- GlobalParamList: ParamListBase,\n- ParamList: ParamListBase = GlobalParamList,\n+ ParamList: ParamListBase,\nRouteName: $Keys<ParamList> = string,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\n@@ -316,7 +302,6 @@ declare module '@react-navigation/bottom-tabs' {\n> =\n| {|\n...BaseScreenProps<\n- GlobalParamList,\nParamList,\nRouteName,\nState,\n@@ -325,18 +310,11 @@ declare module '@react-navigation/bottom-tabs' {\n>,\ncomponent: React$ComponentType<{|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: NavigationProp<\n- GlobalParamList,\n- RouteName,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n+ navigation: any,\n|}>,\n|}\n| {|\n...BaseScreenProps<\n- GlobalParamList,\nParamList,\nRouteName,\nState,\n@@ -345,24 +323,16 @@ declare module '@react-navigation/bottom-tabs' {\n>,\nchildren: ({|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: NavigationProp<\n- GlobalParamList,\n- RouteName,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n+ navigation: any,\n|}) => React$Node,\n|};\ndeclare export type ScreenComponent<\n- GlobalParamList: ParamListBase,\n- ParamList: ParamListBase = GlobalParamList,\n+ ParamList: ParamListBase,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\nEventMap: EventMapBase = EventMapCore<State>,\n> = <RouteName: $Keys<ParamList>>(props: ScreenProps<\n- GlobalParamList,\nParamList,\nRouteName,\nState,\n@@ -371,8 +341,7 @@ declare module '@react-navigation/bottom-tabs' {\n>) => React$Node;\ndeclare export type NavigatorComponent<\n- GlobalParamList: ParamListBase,\n- ParamList: ParamListBase = GlobalParamList,\n+ ParamList: ParamListBase,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\nEventMap: EventMapBase = EventMapCore<State>,\n@@ -383,13 +352,7 @@ declare module '@react-navigation/bottom-tabs' {\n| ScreenOptions\n| ({|\nroute: RouteProp<ParamList, $Keys<ParamList>>,\n- navigation: NavigationProp<\n- GlobalParamList,\n- $Keys<ParamList>,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n+ navigation: any,\n|}) => ScreenOptions,\n...\n}>;\n@@ -398,19 +361,14 @@ declare module '@react-navigation/bottom-tabs' {\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\nEventMap: EventMapBase = EventMapCore<State>,\n- > = <\n- GlobalParamList: ParamListBase,\n- ParamList: ParamListBase = GlobalParamList,\n- >() => {|\n+ > = <ParamList: ParamListBase>() => {|\nScreen: ScreenComponent<\n- GlobalParamList,\nParamList,\nState,\nScreenOptions,\nEventMap,\n>,\nNavigator: NavigatorComponent<\n- GlobalParamList,\nParamList,\nState,\nScreenOptions,\n@@ -790,7 +748,7 @@ declare module '@react-navigation/bottom-tabs' {\nRouteName: $Keys<ParamList> = string,\nOptions: {} = BottomTabNavigationOptions,\nEventMap: EventMapBase = BottomTabNavigationEventMap,\n- > = $ReadOnly<{|\n+ > = {|\n...$Exact<NavigationProp<\nParamList,\nRouteName,\n@@ -803,7 +761,7 @@ declare module '@react-navigation/bottom-tabs' {\nParamList,\n{ ...ParamListBase, ...ParamList },\n>>,\n- |}>;\n+ |};\ndeclare export type BottomTabDescriptor = Descriptor<\nParamListBase,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"diff": "@@ -271,8 +271,7 @@ declare module '@react-navigation/native' {\n>;\ndeclare type BaseScreenProps<\n- GlobalParamList: ParamListBase,\n- ParamList: ParamListBase = GlobalParamList,\n+ ParamList: ParamListBase,\nRouteName: $Keys<ParamList> = string,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\n@@ -283,32 +282,19 @@ declare module '@react-navigation/native' {\n| ScreenOptions\n| ({|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: NavigationProp<\n- GlobalParamList,\n- RouteName,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n+ navigation: any,\n|}) => ScreenOptions,\nlisteners?:\n| ScreenListeners<EventMap, State>\n| ({|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: NavigationProp<\n- GlobalParamList,\n- RouteName,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n+ navigation: any,\n|}) => ScreenListeners<EventMap, State>,\ninitialParams?: $Shape<$ElementType<ParamList, RouteName>>,\n|};\ndeclare export type ScreenProps<\n- GlobalParamList: ParamListBase,\n- ParamList: ParamListBase = GlobalParamList,\n+ ParamList: ParamListBase,\nRouteName: $Keys<ParamList> = string,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\n@@ -316,7 +302,6 @@ declare module '@react-navigation/native' {\n> =\n| {|\n...BaseScreenProps<\n- GlobalParamList,\nParamList,\nRouteName,\nState,\n@@ -325,18 +310,11 @@ declare module '@react-navigation/native' {\n>,\ncomponent: React$ComponentType<{|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: NavigationProp<\n- GlobalParamList,\n- RouteName,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n+ navigation: any,\n|}>,\n|}\n| {|\n...BaseScreenProps<\n- GlobalParamList,\nParamList,\nRouteName,\nState,\n@@ -345,24 +323,16 @@ declare module '@react-navigation/native' {\n>,\nchildren: ({|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: NavigationProp<\n- GlobalParamList,\n- RouteName,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n+ navigation: any,\n|}) => React$Node,\n|};\ndeclare export type ScreenComponent<\n- GlobalParamList: ParamListBase,\n- ParamList: ParamListBase = GlobalParamList,\n+ ParamList: ParamListBase,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\nEventMap: EventMapBase = EventMapCore<State>,\n> = <RouteName: $Keys<ParamList>>(props: ScreenProps<\n- GlobalParamList,\nParamList,\nRouteName,\nState,\n@@ -371,8 +341,7 @@ declare module '@react-navigation/native' {\n>) => React$Node;\ndeclare export type NavigatorComponent<\n- GlobalParamList: ParamListBase,\n- ParamList: ParamListBase = GlobalParamList,\n+ ParamList: ParamListBase,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\nEventMap: EventMapBase = EventMapCore<State>,\n@@ -383,13 +352,7 @@ declare module '@react-navigation/native' {\n| ScreenOptions\n| ({|\nroute: RouteProp<ParamList, $Keys<ParamList>>,\n- navigation: NavigationProp<\n- GlobalParamList,\n- $Keys<ParamList>,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n+ navigation: any,\n|}) => ScreenOptions,\n...\n}>;\n@@ -398,19 +361,14 @@ declare module '@react-navigation/native' {\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\nEventMap: EventMapBase = EventMapCore<State>,\n- > = <\n- GlobalParamList: ParamListBase,\n- ParamList: ParamListBase = GlobalParamList,\n- >() => {|\n+ > = <ParamList: ParamListBase>() => {|\nScreen: ScreenComponent<\n- GlobalParamList,\nParamList,\nState,\nScreenOptions,\nEventMap,\n>,\nNavigator: NavigatorComponent<\n- GlobalParamList,\nParamList,\nState,\nScreenOptions,\n@@ -464,6 +422,12 @@ declare module '@react-navigation/native' {\nsetParams: (params: ScreenParams) => SetParamsAction,\n|};\n+ declare export var createNavigatorFactory: <\n+ State: NavigationState,\n+ ScreenOptions: {},\n+ EventMap: EventMapBase = EventMapCore<State>,\n+ >(navigator: any) => CreateNavigator<State, ScreenOptions, EventMap>;\n+\ndeclare export var StackRouter: any;\ndeclare export var useNavigationBuilder: any;\ndeclare export var createNavigatorFactory: any;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"diff": "@@ -271,8 +271,7 @@ declare module '@react-navigation/stack' {\n>;\ndeclare type BaseScreenProps<\n- GlobalParamList: ParamListBase,\n- ParamList: ParamListBase = GlobalParamList,\n+ ParamList: ParamListBase,\nRouteName: $Keys<ParamList> = string,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\n@@ -283,32 +282,19 @@ declare module '@react-navigation/stack' {\n| ScreenOptions\n| ({|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: NavigationProp<\n- GlobalParamList,\n- RouteName,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n+ navigation: any,\n|}) => ScreenOptions,\nlisteners?:\n| ScreenListeners<EventMap, State>\n| ({|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: NavigationProp<\n- GlobalParamList,\n- RouteName,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n+ navigation: any,\n|}) => ScreenListeners<EventMap, State>,\ninitialParams?: $Shape<$ElementType<ParamList, RouteName>>,\n|};\ndeclare export type ScreenProps<\n- GlobalParamList: ParamListBase,\n- ParamList: ParamListBase = GlobalParamList,\n+ ParamList: ParamListBase,\nRouteName: $Keys<ParamList> = string,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\n@@ -316,7 +302,6 @@ declare module '@react-navigation/stack' {\n> =\n| {|\n...BaseScreenProps<\n- GlobalParamList,\nParamList,\nRouteName,\nState,\n@@ -325,18 +310,11 @@ declare module '@react-navigation/stack' {\n>,\ncomponent: React$ComponentType<{|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: NavigationProp<\n- GlobalParamList,\n- RouteName,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n+ navigation: any,\n|}>,\n|}\n| {|\n...BaseScreenProps<\n- GlobalParamList,\nParamList,\nRouteName,\nState,\n@@ -345,24 +323,16 @@ declare module '@react-navigation/stack' {\n>,\nchildren: ({|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: NavigationProp<\n- GlobalParamList,\n- RouteName,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n+ navigation: any,\n|}) => React$Node,\n|};\ndeclare export type ScreenComponent<\n- GlobalParamList: ParamListBase,\n- ParamList: ParamListBase = GlobalParamList,\n+ ParamList: ParamListBase,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\nEventMap: EventMapBase = EventMapCore<State>,\n> = <RouteName: $Keys<ParamList>>(props: ScreenProps<\n- GlobalParamList,\nParamList,\nRouteName,\nState,\n@@ -371,8 +341,7 @@ declare module '@react-navigation/stack' {\n>) => React$Node;\ndeclare export type NavigatorComponent<\n- GlobalParamList: ParamListBase,\n- ParamList: ParamListBase = GlobalParamList,\n+ ParamList: ParamListBase,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\nEventMap: EventMapBase = EventMapCore<State>,\n@@ -383,13 +352,7 @@ declare module '@react-navigation/stack' {\n| ScreenOptions\n| ({|\nroute: RouteProp<ParamList, $Keys<ParamList>>,\n- navigation: NavigationProp<\n- GlobalParamList,\n- $Keys<ParamList>,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n+ navigation: any,\n|}) => ScreenOptions,\n...\n}>;\n@@ -398,19 +361,14 @@ declare module '@react-navigation/stack' {\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\nEventMap: EventMapBase = EventMapCore<State>,\n- > = <\n- GlobalParamList: ParamListBase,\n- ParamList: ParamListBase = GlobalParamList,\n- >() => {|\n+ > = <ParamList: ParamListBase>() => {|\nScreen: ScreenComponent<\n- GlobalParamList,\nParamList,\nState,\nScreenOptions,\nEventMap,\n>,\nNavigator: NavigatorComponent<\n- GlobalParamList,\nParamList,\nState,\nScreenOptions,\n@@ -876,7 +834,7 @@ declare module '@react-navigation/stack' {\nRouteName: $Keys<ParamList> = string,\nOptions: {} = StackOptions,\nEventMap: EventMapBase = StackNavigationEventMap,\n- > = $ReadOnly<{|\n+ > = {|\n...$Exact<NavigationProp<\nParamList,\nRouteName,\n@@ -896,7 +854,7 @@ declare module '@react-navigation/stack' {\n>>,\n+pop: (count?: number) => void,\n+popToTop: () => void,\n- |}>;\n+ |};\ndeclare export type StackHeaderLeftButtonProps = {|\nonPress: ?(() => void),\n"
},
{
"change_type": "MODIFY",
"old_path": "native/more/more.react.js",
"new_path": "native/more/more.react.js",
"diff": "@@ -40,12 +40,11 @@ const buildInfoOptions = { headerTitle: 'Build info' };\nconst devToolsOptions = { headerTitle: 'Developer tools' };\nconst appearanceOptions = { headerTitle: 'Appearance' };\n-export type MoreNavigationProp<RouteName: string> = StackNavigationProp<\n- ScreenParamList,\n- RouteName,\n->;\n+export type MoreNavigationProp<\n+ RouteName: $Keys<MoreParamList> = $Keys<MoreParamList>,\n+> = StackNavigationProp<ScreenParamList, RouteName>;\n-const More = createStackNavigator<ScreenParamList, MoreParamList>();\n+const More = createStackNavigator<MoreParamList>();\nconst MoreComponent = () => (\n<More.Navigator screenOptions={screenOptions}>\n<More.Screen\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/app-navigator.react.js",
"new_path": "native/navigation/app-navigator.react.js",
"diff": "@@ -24,6 +24,7 @@ import {\nCameraModalRouteName,\ntype ScreenParamList,\ntype TabParamList,\n+ type OverlayParamList,\n} from './route-names';\nimport Calendar from '../calendar/calendar.react';\nimport Chat from '../chat/chat.react';\n@@ -63,12 +64,11 @@ const moreTabOptions = {\n),\n};\n-export type TabNavigationProp<RouteName: string> = BottomTabNavigationProp<\n- ScreenParamList,\n- RouteName,\n->;\n+export type TabNavigationProp<\n+ RouteName: $Keys<TabParamList> = $Keys<TabParamList>,\n+> = BottomTabNavigationProp<ScreenParamList, RouteName>;\n-const Tab = createBottomTabNavigator<ScreenParamList, TabParamList>();\n+const Tab = createBottomTabNavigator<TabParamList>();\nconst tabBarOptions = { keyboardHidesTabBar: false };\nfunction TabNavigator() {\nreturn (\n@@ -98,15 +98,14 @@ function TabNavigator() {\n);\n}\n-export type AppNavigationProp<RouteName: string> = OverlayRouterNavigationProp<\n- ScreenParamList,\n- RouteName,\n->;\n+export type AppNavigationProp<\n+ RouteName: $Keys<OverlayParamList> = $Keys<OverlayParamList>,\n+> = OverlayRouterNavigationProp<ScreenParamList, RouteName>;\n-const App = createOverlayNavigator();\n-type AppNavigatorProps = {|\n+const App = createOverlayNavigator<OverlayParamList>();\n+type AppNavigatorProps = {\nnavigation: RootNavigationProp<'App'>,\n-|};\n+};\nfunction AppNavigator(props: AppNavigatorProps) {\nconst { navigation } = props;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-navigator.react.js",
"new_path": "native/navigation/overlay-navigator.react.js",
"diff": "// @flow\n+import type { StackNavigationState } from '@react-navigation/stack';\n+\nimport * as React from 'react';\nimport { View, StyleSheet } from 'react-native';\nimport Animated, { Easing } from 'react-native-reanimated';\n@@ -364,7 +366,11 @@ const OverlayNavigator = React.memo<any>(\n},\n);\nOverlayNavigator.displayName = 'OverlayNavigator';\n-const createOverlayNavigator = createNavigatorFactory(OverlayNavigator);\n+const createOverlayNavigator = createNavigatorFactory<\n+ StackNavigationState,\n+ {||},\n+ {||},\n+>(OverlayNavigator);\nconst styles = StyleSheet.create({\ncontainer: {\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-router.js",
"new_path": "native/navigation/overlay-router.js",
"diff": "@@ -26,10 +26,10 @@ export type OverlayRouterNavigationAction =\nexport type OverlayRouterNavigationProp<\nParamList: ParamListBase,\nRouteName: string,\n-> = $ReadOnly<{|\n+> = {|\n...StackNavigationProp<ParamList, RouteName, {||}, {||}>,\n+clearOverlayModals: (keys: $ReadOnlyArray<string>) => void,\n-|}>;\n+|};\nfunction OverlayRouter(routerOptions: StackOptions) {\nconst stackRouter = StackRouter(routerOptions);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/root-navigator.react.js",
"new_path": "native/navigation/root-navigator.react.js",
"diff": "@@ -7,7 +7,13 @@ import {\ncreateNavigatorFactory,\nuseNavigationBuilder,\n} from '@react-navigation/native';\n-import { StackView, TransitionPresets } from '@react-navigation/stack';\n+import {\n+ StackView,\n+ TransitionPresets,\n+ type StackNavigationState,\n+ type StackOptions,\n+ type StackNavigationEventMap,\n+} from '@react-navigation/stack';\nimport NavigationBuilderContext from '@react-navigation/core/src/NavigationBuilderContext';\nimport invariant from 'invariant';\n@@ -21,6 +27,7 @@ import {\nColorPickerModalRouteName,\nComposeSubthreadModalRouteName,\ntype ScreenParamList,\n+ type RootParamList,\n} from './route-names';\nimport LoggedOutModal from '../account/logged-out-modal.react';\nimport VerificationModal from '../account/verification-modal.react';\n@@ -45,7 +52,7 @@ if (Platform.OS !== 'android' || Platform.Version >= 21) {\n}\nexport type RootNavigationProp<\n- RouteName: string = $Keys<ScreenParamList>,\n+ RouteName: $Keys<ScreenParamList> = $Keys<ScreenParamList>,\n> = RootRouterNavigationProp<ScreenParamList, RouteName>;\nfunction RootNavigator({ initialRouteName, children, screenOptions, ...rest }) {\n@@ -75,7 +82,11 @@ function RootNavigator({ initialRouteName, children, screenOptions, ...rest }) {\n</RootNavigatorContext.Provider>\n);\n}\n-const createRootNavigator = createNavigatorFactory(RootNavigator);\n+const createRootNavigator = createNavigatorFactory<\n+ StackNavigationState,\n+ StackOptions,\n+ StackNavigationEventMap,\n+>(RootNavigator);\nconst baseTransitionPreset = Platform.select({\nios: TransitionPresets.ModalSlideFromBottomIOS,\n@@ -102,7 +113,7 @@ const transitionPreset = {\n},\n};\n-const Root = createRootNavigator();\n+const Root = createRootNavigator<RootParamList>();\nconst defaultScreenOptions = {\ngestureEnabled: Platform.OS === 'ios',\nanimationEnabled: Platform.OS !== 'web',\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/root-router.js",
"new_path": "native/navigation/root-router.js",
"diff": "@@ -56,13 +56,13 @@ export type RootRouterNavigationAction =\nexport type RootRouterNavigationProp<\nParamList: ParamListBase,\nRouteName: string,\n-> = $ReadOnly<{|\n+> = {|\n...StackNavigationProp<ParamList, RouteName>,\n+logIn: () => void,\n+logOut: () => void,\n+clearRootModals: (keys: $ReadOnlyArray<string>) => void,\n+setNavState: (state: NavigationState) => void,\n-|}>;\n+|};\nfunction resetState(\nnewPartialRoute: PossiblyStaleRoute<>,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Fix up CreateNavigator to work across the app and with custom navigators
Had to any-type nav prop unfortunately... |
129,187 | 27.05.2020 14:28:52 | 14,400 | 4e1015daf9e30c9afff3c4a0f6faa144ec3c1f9e | [native] Type routers for React Nav | [
{
"change_type": "MODIFY",
"old_path": "native/chat/chat-router.js",
"new_path": "native/chat/chat-router.js",
"diff": "@@ -6,7 +6,11 @@ import type {\nParamListBase,\nStackAction,\nRoute,\n- StackOptions,\n+ Router,\n+ StackRouterOptions,\n+ StackNavigationState,\n+ RouterConfigOptions,\n+ GenericNavigationAction,\n} from '@react-navigation/stack';\nimport { StackRouter, CommonActions } from '@react-navigation/native';\n@@ -69,11 +73,22 @@ export type ChatRouterNavigationProp<\n+pushNewThread: (threadInfo: ThreadInfo) => void,\n|};\n-function ChatRouter(routerOptions: StackOptions) {\n- const stackRouter = StackRouter(routerOptions);\n+function ChatRouter(\n+ routerOptions: StackRouterOptions,\n+): Router<StackNavigationState, ChatRouterNavigationAction> {\n+ const {\n+ getStateForAction: baseGetStateForAction,\n+ actionCreators: baseActionCreators,\n+ shouldActionChangeFocus: baseShouldActionChangeFocus,\n+ ...rest\n+ } = StackRouter(routerOptions);\nreturn {\n- ...stackRouter,\n- getStateForAction: (lastState, action, options) => {\n+ ...rest,\n+ getStateForAction: (\n+ lastState: StackNavigationState,\n+ action: ChatRouterNavigationAction,\n+ options: RouterConfigOptions,\n+ ) => {\nif (action.type === clearScreensActionType) {\nconst { routeNames } = action.payload;\nif (!lastState) {\n@@ -97,11 +112,7 @@ function ChatRouter(routerOptions: StackOptions) {\nkey: `${MessageListRouteName}${threadInfo.id}`,\nparams: { threadInfo },\n});\n- return stackRouter.getStateForAction(\n- clearedState,\n- navigateAction,\n- options,\n- );\n+ return baseGetStateForAction(clearedState, navigateAction, options);\n} else if (action.type === clearThreadsActionType) {\nconst threadIDs = new Set(action.payload.threadIDs);\nif (!lastState) {\n@@ -125,17 +136,13 @@ function ChatRouter(routerOptions: StackOptions) {\nkey: `${MessageListRouteName}${threadInfo.id}`,\nparams: { threadInfo },\n});\n- return stackRouter.getStateForAction(\n- clearedState,\n- navigateAction,\n- options,\n- );\n+ return baseGetStateForAction(clearedState, navigateAction, options);\n} else {\n- return stackRouter.getStateForAction(lastState, action, options);\n+ return baseGetStateForAction(lastState, action, options);\n}\n},\nactionCreators: {\n- ...stackRouter.actionCreators,\n+ ...baseActionCreators,\nclearScreens: (routeNames: $ReadOnlyArray<string>) => ({\ntype: clearScreensActionType,\npayload: {\n@@ -155,13 +162,14 @@ function ChatRouter(routerOptions: StackOptions) {\npayload: { threadInfo },\n}),\n},\n- shouldActionChangeFocus: action => {\n+ shouldActionChangeFocus: (action: GenericNavigationAction) => {\nif (action.type === replaceWithThreadActionType) {\nreturn true;\n} else if (action.type === pushNewThreadActionType) {\nreturn true;\n+ } else {\n+ return baseShouldActionChangeFocus(action);\n}\n- return stackRouter.shouldActionChangeFocus(action);\n},\n};\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"diff": "@@ -69,10 +69,10 @@ declare module '@react-navigation/bottom-tabs' {\n| SetParamsAction;\ndeclare export type GenericNavigationAction = {|\n- type: string,\n- payload?: { [key: string]: mixed },\n- source?: string,\n- target?: string,\n+ +type: string,\n+ +payload?: { +[key: string]: mixed },\n+ +source?: string,\n+ +target?: string,\n|};\ndeclare export type LeafRoute<RouteName: string = string> = {|\n@@ -129,6 +129,103 @@ declare module '@react-navigation/bottom-tabs' {\n| Route<RouteName>\n| StaleRoute<RouteName>;\n+ declare type ActionCreators<+Action: GenericNavigationAction> = {\n+ +[key: string]: (...args: any) => Action,\n+ };\n+\n+ declare type DefaultRouterOptions = {\n+ initialRouteName?: string,\n+ };\n+\n+ declare export type RouterFactory<\n+ State: NavigationState,\n+ Action: GenericNavigationAction,\n+ RouterOptions: DefaultRouterOptions,\n+ > = (options: RouterOptions) => Router<State, Action>;\n+\n+ declare export type RouterConfigOptions = {|\n+ +routeNames: $ReadOnlyArray<string>,\n+ +routeParamList: ParamListBase,\n+ |};\n+\n+ declare export type Router<\n+ State: NavigationState,\n+ Action: GenericNavigationAction,\n+ > = {|\n+ type: $PropertyType<State, 'type'>,\n+ getInitialState: (options: RouterConfigOptions) => State,\n+ getRehydratedState: (\n+ partialState: PossibleStaleNavigationState,\n+ options: RouterConfigOptions,\n+ ) => State,\n+ getStateForRouteNamesChange: (\n+ state: State,\n+ options: RouterConfigOptions,\n+ ) => State,\n+ getStateForRouteFocus: (state: State, key: string) => State,\n+ getStateForAction: (\n+ state: State,\n+ action: Action,\n+ options: RouterConfigOptions,\n+ ) => ?PossiblyStaleNavigationState;\n+ shouldActionChangeFocus: (action: GenericNavigationAction) => boolean,\n+ actionCreators?: ActionCreators<Action>,\n+ |};\n+\n+ declare export type StackNavigationState = {|\n+ ...NavigationState,\n+ +type: 'stack',\n+ |};\n+ declare export type ReplaceAction = {|\n+ +type: 'REPLACE',\n+ +payload: {| name: string, key?: ?string, params?: ScreenParams |},\n+ +source?: string,\n+ +target?: string,\n+ |};\n+ declare export type PushAction = {|\n+ +type: 'PUSH',\n+ +payload: {| name: string, key?: ?string, params?: ScreenParams |},\n+ +source?: string,\n+ +target?: string,\n+ |};\n+ declare export type PopAction = {|\n+ +type: 'POP',\n+ +payload: {| count: number |},\n+ +source?: string,\n+ +target?: string,\n+ |};\n+ declare export type PopToTopAction = {|\n+ +type: 'POP_TO_TOP',\n+ +source?: string,\n+ +target?: string,\n+ |};\n+ declare export type StackAction =\n+ | CommonAction\n+ | ReplaceAction\n+ | PushAction\n+ | PopAction\n+ | PopToTopAction;\n+ declare export type StackRouterOptions = $Exact<DefaultRouterOptions>;\n+\n+ declare export type TabNavigationState = {|\n+ ...NavigationState,\n+ +type: 'tab',\n+ +history: $ReadOnlyArray<{| type: 'route', key: string |}>,\n+ |};\n+ declare export type JumpToAction = {|\n+ +type: 'JUMP_TO',\n+ +payload: {| name: string, params?: ScreenParams |},\n+ +source?: string,\n+ +target?: string,\n+ |};\n+ declare export type TabAction =\n+ | CommonAction\n+ | JumpToAction;\n+ declare export type TabRouterOptions = {|\n+ ...$Exact<DefaultRouterOptions>,\n+ backBehavior?: 'initialRoute' | 'order' | 'history' | 'none',\n+ |};\n+\ndeclare export type ParamListBase = { +[key: string]: ?ScreenParams };\ndeclare type EventMapBase = {\n@@ -346,8 +443,8 @@ declare module '@react-navigation/bottom-tabs' {\nScreenOptions: {} = {},\nEventMap: EventMapBase = EventMapCore<State>,\n> = React$ComponentType<{\n+ ...DefaultRouterOptions,\nchildren?: React.Node,\n- initialRouteName?: $Keys<ParamList>,\nscreenOptions?:\n| ScreenOptions\n| ({|\n@@ -705,21 +802,6 @@ declare module '@react-navigation/bottom-tabs' {\n// React Navigation libdef.\n//---------------------------------------------------------------------------\n- declare export type JumpToAction = {|\n- +type: 'JUMP_TO',\n- +payload: {| name: string, params?: ScreenParams |},\n- +source?: string,\n- +target?: string,\n- |};\n- declare export type BottomTabAction =\n- | JumpToAction;\n-\n- declare export type TabNavigationState = {|\n- ...NavigationState,\n- +type: 'tab',\n- +history: $ReadOnlyArray<{| type: 'route', key: string |}>,\n- |};\n-\ndeclare export type BottomTabNavigationOptions = $Shape<{|\ntitle: string,\ntabBarLabel:\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"diff": "@@ -69,10 +69,10 @@ declare module '@react-navigation/native' {\n| SetParamsAction;\ndeclare export type GenericNavigationAction = {|\n- type: string,\n- payload?: { [key: string]: mixed },\n- source?: string,\n- target?: string,\n+ +type: string,\n+ +payload?: { +[key: string]: mixed },\n+ +source?: string,\n+ +target?: string,\n|};\ndeclare export type LeafRoute<RouteName: string = string> = {|\n@@ -129,6 +129,103 @@ declare module '@react-navigation/native' {\n| Route<RouteName>\n| StaleRoute<RouteName>;\n+ declare type ActionCreators<+Action: GenericNavigationAction> = {\n+ +[key: string]: (...args: any) => Action,\n+ };\n+\n+ declare type DefaultRouterOptions = {\n+ initialRouteName?: string,\n+ };\n+\n+ declare export type RouterFactory<\n+ State: NavigationState,\n+ Action: GenericNavigationAction,\n+ RouterOptions: DefaultRouterOptions,\n+ > = (options: RouterOptions) => Router<State, Action>;\n+\n+ declare export type RouterConfigOptions = {|\n+ +routeNames: $ReadOnlyArray<string>,\n+ +routeParamList: ParamListBase,\n+ |};\n+\n+ declare export type Router<\n+ State: NavigationState,\n+ Action: GenericNavigationAction,\n+ > = {|\n+ type: $PropertyType<State, 'type'>,\n+ getInitialState: (options: RouterConfigOptions) => State,\n+ getRehydratedState: (\n+ partialState: PossibleStaleNavigationState,\n+ options: RouterConfigOptions,\n+ ) => State,\n+ getStateForRouteNamesChange: (\n+ state: State,\n+ options: RouterConfigOptions,\n+ ) => State,\n+ getStateForRouteFocus: (state: State, key: string) => State,\n+ getStateForAction: (\n+ state: State,\n+ action: Action,\n+ options: RouterConfigOptions,\n+ ) => ?PossiblyStaleNavigationState;\n+ shouldActionChangeFocus: (action: GenericNavigationAction) => boolean,\n+ actionCreators?: ActionCreators<Action>,\n+ |};\n+\n+ declare export type StackNavigationState = {|\n+ ...NavigationState,\n+ +type: 'stack',\n+ |};\n+ declare export type ReplaceAction = {|\n+ +type: 'REPLACE',\n+ +payload: {| name: string, key?: ?string, params?: ScreenParams |},\n+ +source?: string,\n+ +target?: string,\n+ |};\n+ declare export type PushAction = {|\n+ +type: 'PUSH',\n+ +payload: {| name: string, key?: ?string, params?: ScreenParams |},\n+ +source?: string,\n+ +target?: string,\n+ |};\n+ declare export type PopAction = {|\n+ +type: 'POP',\n+ +payload: {| count: number |},\n+ +source?: string,\n+ +target?: string,\n+ |};\n+ declare export type PopToTopAction = {|\n+ +type: 'POP_TO_TOP',\n+ +source?: string,\n+ +target?: string,\n+ |};\n+ declare export type StackAction =\n+ | CommonAction\n+ | ReplaceAction\n+ | PushAction\n+ | PopAction\n+ | PopToTopAction;\n+ declare export type StackRouterOptions = $Exact<DefaultRouterOptions>;\n+\n+ declare export type TabNavigationState = {|\n+ ...NavigationState,\n+ +type: 'tab',\n+ +history: $ReadOnlyArray<{| type: 'route', key: string |}>,\n+ |};\n+ declare export type JumpToAction = {|\n+ +type: 'JUMP_TO',\n+ +payload: {| name: string, params?: ScreenParams |},\n+ +source?: string,\n+ +target?: string,\n+ |};\n+ declare export type TabAction =\n+ | CommonAction\n+ | JumpToAction;\n+ declare export type TabRouterOptions = {|\n+ ...$Exact<DefaultRouterOptions>,\n+ backBehavior?: 'initialRoute' | 'order' | 'history' | 'none',\n+ |};\n+\ndeclare export type ParamListBase = { +[key: string]: ?ScreenParams };\ndeclare type EventMapBase = {\n@@ -346,8 +443,8 @@ declare module '@react-navigation/native' {\nScreenOptions: {} = {},\nEventMap: EventMapBase = EventMapCore<State>,\n> = React$ComponentType<{\n+ ...DefaultRouterOptions,\nchildren?: React.Node,\n- initialRouteName?: $Keys<ParamList>,\nscreenOptions?:\n| ScreenOptions\n| ({|\n@@ -416,10 +513,10 @@ declare module '@react-navigation/native' {\n|};\ndeclare export var CommonActions: {|\n- navigate: NavigateActionCreator,\n- goBack: () => BackAction,\n- reset: (state: PossiblyStaleNavigationState) => ResetAction,\n- setParams: (params: ScreenParams) => SetParamsAction,\n+ +navigate: NavigateActionCreator,\n+ +goBack: () => BackAction,\n+ +reset: (state: PossiblyStaleNavigationState) => ResetAction,\n+ +setParams: (params: ScreenParams) => SetParamsAction,\n|};\ndeclare export var createNavigatorFactory: <\n@@ -428,7 +525,18 @@ declare module '@react-navigation/native' {\nEventMap: EventMapBase = EventMapCore<State>,\n>(navigator: any) => CreateNavigator<State, ScreenOptions, EventMap>;\n- declare export var StackRouter: any;\n+ declare export var StackRouter: RouterFactory<\n+ StackNavigationState,\n+ StackAction,\n+ StackRouterOptions,\n+ >;\n+\n+ declare export var TabRouter: RouterFactory<\n+ TabNavigationState,\n+ TabAction,\n+ TabRouterOptions,\n+ >;\n+\ndeclare export var useNavigationBuilder: any;\ndeclare export var NavigationHelpersContext: any;\ndeclare export var NavigationContainer: any;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"diff": "@@ -69,10 +69,10 @@ declare module '@react-navigation/stack' {\n| SetParamsAction;\ndeclare export type GenericNavigationAction = {|\n- type: string,\n- payload?: { [key: string]: mixed },\n- source?: string,\n- target?: string,\n+ +type: string,\n+ +payload?: { +[key: string]: mixed },\n+ +source?: string,\n+ +target?: string,\n|};\ndeclare export type LeafRoute<RouteName: string = string> = {|\n@@ -129,6 +129,103 @@ declare module '@react-navigation/stack' {\n| Route<RouteName>\n| StaleRoute<RouteName>;\n+ declare type ActionCreators<+Action: GenericNavigationAction> = {\n+ +[key: string]: (...args: any) => Action,\n+ };\n+\n+ declare type DefaultRouterOptions = {\n+ initialRouteName?: string,\n+ };\n+\n+ declare export type RouterFactory<\n+ State: NavigationState,\n+ Action: GenericNavigationAction,\n+ RouterOptions: DefaultRouterOptions,\n+ > = (options: RouterOptions) => Router<State, Action>;\n+\n+ declare export type RouterConfigOptions = {|\n+ +routeNames: $ReadOnlyArray<string>,\n+ +routeParamList: ParamListBase,\n+ |};\n+\n+ declare export type Router<\n+ State: NavigationState,\n+ Action: GenericNavigationAction,\n+ > = {|\n+ type: $PropertyType<State, 'type'>,\n+ getInitialState: (options: RouterConfigOptions) => State,\n+ getRehydratedState: (\n+ partialState: PossibleStaleNavigationState,\n+ options: RouterConfigOptions,\n+ ) => State,\n+ getStateForRouteNamesChange: (\n+ state: State,\n+ options: RouterConfigOptions,\n+ ) => State,\n+ getStateForRouteFocus: (state: State, key: string) => State,\n+ getStateForAction: (\n+ state: State,\n+ action: Action,\n+ options: RouterConfigOptions,\n+ ) => ?PossiblyStaleNavigationState;\n+ shouldActionChangeFocus: (action: GenericNavigationAction) => boolean,\n+ actionCreators?: ActionCreators<Action>,\n+ |};\n+\n+ declare export type StackNavigationState = {|\n+ ...NavigationState,\n+ +type: 'stack',\n+ |};\n+ declare export type ReplaceAction = {|\n+ +type: 'REPLACE',\n+ +payload: {| name: string, key?: ?string, params?: ScreenParams |},\n+ +source?: string,\n+ +target?: string,\n+ |};\n+ declare export type PushAction = {|\n+ +type: 'PUSH',\n+ +payload: {| name: string, key?: ?string, params?: ScreenParams |},\n+ +source?: string,\n+ +target?: string,\n+ |};\n+ declare export type PopAction = {|\n+ +type: 'POP',\n+ +payload: {| count: number |},\n+ +source?: string,\n+ +target?: string,\n+ |};\n+ declare export type PopToTopAction = {|\n+ +type: 'POP_TO_TOP',\n+ +source?: string,\n+ +target?: string,\n+ |};\n+ declare export type StackAction =\n+ | CommonAction\n+ | ReplaceAction\n+ | PushAction\n+ | PopAction\n+ | PopToTopAction;\n+ declare export type StackRouterOptions = $Exact<DefaultRouterOptions>;\n+\n+ declare export type TabNavigationState = {|\n+ ...NavigationState,\n+ +type: 'tab',\n+ +history: $ReadOnlyArray<{| type: 'route', key: string |}>,\n+ |};\n+ declare export type JumpToAction = {|\n+ +type: 'JUMP_TO',\n+ +payload: {| name: string, params?: ScreenParams |},\n+ +source?: string,\n+ +target?: string,\n+ |};\n+ declare export type TabAction =\n+ | CommonAction\n+ | JumpToAction;\n+ declare export type TabRouterOptions = {|\n+ ...$Exact<DefaultRouterOptions>,\n+ backBehavior?: 'initialRoute' | 'order' | 'history' | 'none',\n+ |};\n+\ndeclare export type ParamListBase = { +[key: string]: ?ScreenParams };\ndeclare type EventMapBase = {\n@@ -346,8 +443,8 @@ declare module '@react-navigation/stack' {\nScreenOptions: {} = {},\nEventMap: EventMapBase = EventMapCore<State>,\n> = React$ComponentType<{\n+ ...DefaultRouterOptions,\nchildren?: React.Node,\n- initialRouteName?: $Keys<ParamList>,\nscreenOptions?:\n| ScreenOptions\n| ({|\n@@ -705,40 +802,6 @@ declare module '@react-navigation/stack' {\n// React Navigation libdef.\n//---------------------------------------------------------------------------\n- declare export type ReplaceAction = {|\n- +type: 'REPLACE',\n- +payload: {| name: string, key?: ?string, params?: ScreenParams |},\n- +source?: string,\n- +target?: string,\n- |};\n- declare export type PushAction = {|\n- +type: 'PUSH',\n- +payload: {| name: string, key?: ?string, params?: ScreenParams |},\n- +source?: string,\n- +target?: string,\n- |};\n- declare export type PopAction = {|\n- +type: 'POP',\n- +payload: {| count: number |},\n- +source?: string,\n- +target?: string,\n- |};\n- declare export type PopToTopAction = {|\n- +type: 'POP_TO_TOP',\n- +source?: string,\n- +target?: string,\n- |};\n- declare export type StackAction =\n- | ReplaceAction\n- | PushAction\n- | PopAction\n- | PopToTopAction;\n-\n- declare export type StackNavigationState = {|\n- ...NavigationState,\n- +type: 'stack',\n- |};\n-\ndeclare export type StackDescriptor = Descriptor<\nParamListBase,\nstring,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-router.js",
"new_path": "native/navigation/overlay-router.js",
"diff": "@@ -5,7 +5,10 @@ import type {\nParamListBase,\nStackAction,\nRoute,\n- StackOptions,\n+ Router,\n+ StackRouterOptions,\n+ StackNavigationState,\n+ RouterConfigOptions,\n} from '@react-navigation/stack';\nimport { StackRouter } from '@react-navigation/native';\n@@ -31,11 +34,21 @@ export type OverlayRouterNavigationProp<\n+clearOverlayModals: (keys: $ReadOnlyArray<string>) => void,\n|};\n-function OverlayRouter(routerOptions: StackOptions) {\n- const stackRouter = StackRouter(routerOptions);\n+function OverlayRouter(\n+ routerOptions: StackRouterOptions,\n+): Router<StackNavigationState, OverlayRouterNavigationAction> {\n+ const {\n+ getStateForAction: baseGetStateForAction,\n+ actionCreators: baseActionCreators,\n+ ...rest\n+ } = StackRouter(routerOptions);\nreturn {\n- ...stackRouter,\n- getStateForAction: (lastState, action, options) => {\n+ ...rest,\n+ getStateForAction: (\n+ lastState: StackNavigationState,\n+ action: OverlayRouterNavigationAction,\n+ options: RouterConfigOptions,\n+ ) => {\nif (action.type === clearOverlayModalsActionType) {\nconst { keys } = action.payload;\nif (!lastState) {\n@@ -45,11 +58,11 @@ function OverlayRouter(routerOptions: StackOptions) {\nkeys.includes(route.key) ? 'remove' : 'keep',\n);\n} else {\n- return stackRouter.getStateForAction(lastState, action, options);\n+ return baseGetStateForAction(lastState, action, options);\n}\n},\nactionCreators: {\n- ...stackRouter.actionCreators,\n+ ...baseActionCreators,\nclearOverlayModals: (keys: $ReadOnlyArray<string>) => ({\ntype: clearOverlayModalsActionType,\npayload: { keys },\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/root-router.js",
"new_path": "native/navigation/root-router.js",
"diff": "@@ -5,9 +5,12 @@ import type {\nParamListBase,\nNavigationState,\nStackAction,\n- Route,\nPossiblyStaleRoute,\n- StackOptions,\n+ Router,\n+ StackRouterOptions,\n+ StackNavigationState,\n+ RouterConfigOptions,\n+ PossiblyStaleNavigationState,\n} from '@react-navigation/stack';\nimport { StackRouter, CommonActions } from '@react-navigation/native';\n@@ -64,10 +67,13 @@ export type RootRouterNavigationProp<\n+setNavState: (state: NavigationState) => void,\n|};\n-function resetState(\n- newPartialRoute: PossiblyStaleRoute<>,\n- oldRoute: PossiblyStaleRoute<>,\n-) {\n+type ResetStateRoute = {\n+ +state?: { +routes: $ReadOnlyArray<ResetStateRoute> },\n+};\n+function resetState<Route: ResetStateRoute>(\n+ newPartialRoute: Route,\n+ oldRoute: Route,\n+): Route {\nif (!newPartialRoute.state) {\ninvariant(!oldRoute.state, 'resetState found non-matching state');\nreturn { ...oldRoute, ...newPartialRoute };\n@@ -90,30 +96,48 @@ function resetState(\n};\n}\n-function RootRouter(routerOptions: StackOptions) {\n- const stackRouter = StackRouter(routerOptions);\n+function RootRouter(\n+ routerOptions: StackRouterOptions,\n+): Router<StackNavigationState, RootRouterNavigationAction> {\n+ const {\n+ getStateForAction: baseGetStateForAction,\n+ actionCreators: baseActionCreators,\n+ ...rest\n+ } = StackRouter(routerOptions);\nreturn {\n- ...stackRouter,\n- getStateForAction: (lastState, action, options) => {\n+ ...rest,\n+ getStateForAction: (\n+ lastState: StackNavigationState,\n+ action: RootRouterNavigationAction,\n+ options: RouterConfigOptions,\n+ ) => {\nif (action.type === logInActionType) {\nif (!lastState) {\nreturn lastState;\n}\n- return removeScreensFromStack(lastState, (route: Route<>) =>\n+ return removeScreensFromStack(\n+ lastState,\n+ (route: PossiblyStaleRoute<>) =>\naccountModals.includes(route.name) ? 'remove' : 'keep',\n);\n} else if (action.type === logOutActionType) {\nif (!lastState) {\nreturn lastState;\n}\n- let newState = { ...lastState };\n- newState.routes[0] = resetState(\n+ const [firstRoute, ...restRoutes] = lastState.routes;\n+ const newFirstRoute = resetState(\ndefaultNavigationState.routes[0],\n- newState.routes[0],\n+ firstRoute,\n);\n+ let newState: PossiblyStaleNavigationState = ({\n+ ...lastState,\n+ routes: [newFirstRoute, ...restRoutes],\n+ }: any);\nlet loggedOutModalFound = false;\n- newState = removeScreensFromStack(newState, (route: Route<>) => {\n+ newState = removeScreensFromStack(\n+ newState,\n+ (route: PossiblyStaleRoute<>) => {\nconst { name } = route;\nif (name === LoggedOutModalRouteName) {\nloggedOutModalFound = true;\n@@ -121,22 +145,23 @@ function RootRouter(routerOptions: StackOptions) {\nreturn name === AppRouteName || accountModals.includes(name)\n? 'keep'\n: 'remove';\n- });\n+ },\n+ );\nif (!loggedOutModalFound) {\n- const [appRoute, ...restRoutes] = newState.routes;\n- newState = {\n+ const [appRoute, ...restNewRoutes] = newState.routes;\n+ newState = ({\n...newState,\nindex: newState.index + 1,\nroutes: [\nappRoute,\n{ name: LoggedOutModalRouteName },\n- ...restRoutes,\n+ ...restNewRoutes,\n],\n- };\n+ }: any);\n}\n- return stackRouter.getStateForAction(\n+ return baseGetStateForAction(\nlastState,\nCommonActions.reset(newState),\noptions,\n@@ -146,7 +171,9 @@ function RootRouter(routerOptions: StackOptions) {\nif (!lastState) {\nreturn lastState;\n}\n- return removeScreensFromStack(lastState, (route: Route<>) =>\n+ return removeScreensFromStack(\n+ lastState,\n+ (route: PossiblyStaleRoute<>) =>\nkeys.includes(route.key) ? 'remove' : 'keep',\n);\n} else if (action.type === setNavStateActionType) {\n@@ -155,11 +182,7 @@ function RootRouter(routerOptions: StackOptions) {\nif (!lastState) {\nreturn lastState;\n}\n- const newState = stackRouter.getStateForAction(\n- lastState,\n- action,\n- options,\n- );\n+ const newState = baseGetStateForAction(lastState, action, options);\nif (!newState) {\nreturn newState;\n}\n@@ -175,7 +198,7 @@ function RootRouter(routerOptions: StackOptions) {\n}\n},\nactionCreators: {\n- ...stackRouter.actionCreators,\n+ ...baseActionCreators,\nlogIn: () => ({ type: logInActionType }),\nlogOut: () => ({ type: logOutActionType }),\nclearRootModals: (keys: $ReadOnlyArray<string>) => ({\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Type routers for React Nav |
129,187 | 27.05.2020 14:55:33 | 14,400 | 8b3594a213080542c82c7b73dc775cf3ceff8898 | [native] Type navigator props for React Nav | [
{
"change_type": "MODIFY",
"old_path": "native/chat/chat.react.js",
"new_path": "native/chat/chat.react.js",
"diff": "@@ -10,6 +10,7 @@ import {\ntype StackNavigationState,\ntype StackOptions,\ntype StackNavigationEventMap,\n+ type StackNavigatorProps,\n} from '@react-navigation/stack';\nimport { Platform, StyleSheet } from 'react-native';\nimport invariant from 'invariant';\n@@ -39,7 +40,12 @@ import MessageListHeaderTitle from './message-list-header-title.react';\nimport ThreadSettingsButton from './thread-settings-button.react';\nimport { InputStateContext } from '../input/input-state';\n-function ChatNavigator({ initialRouteName, children, screenOptions, ...rest }) {\n+function ChatNavigator({\n+ initialRouteName,\n+ children,\n+ screenOptions,\n+ ...rest\n+}: StackNavigatorProps) {\nconst { state, descriptors, navigation } = useNavigationBuilder(ChatRouter, {\ninitialRouteName,\nchildren,\n@@ -74,6 +80,7 @@ const createChatNavigator = createNavigatorFactory<\nStackNavigationState,\nStackOptions,\nStackNavigationEventMap,\n+ StackNavigatorProps,\n>(ChatNavigator);\nconst header = props => <ChatHeader {...props} />;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"diff": "@@ -437,27 +437,20 @@ declare module '@react-navigation/bottom-tabs' {\nEventMap,\n>) => React$Node;\n- declare export type NavigatorComponent<\n- ParamList: ParamListBase,\n- State: NavigationState = NavigationState,\n- ScreenOptions: {} = {},\n- EventMap: EventMapBase = EventMapCore<State>,\n- > = React$ComponentType<{\n+ declare export type BaseNavigatorProps<ScreenOptions: {}> = {\n...DefaultRouterOptions,\nchildren?: React.Node,\nscreenOptions?:\n| ScreenOptions\n- | ({|\n- route: RouteProp<ParamList, $Keys<ParamList>>,\n- navigation: any,\n- |}) => ScreenOptions,\n+ | ({| route: LeafRoute<>, navigation: any |}) => ScreenOptions,\n...\n- }>;\n+ };\ndeclare export type CreateNavigator<\n- State: NavigationState = NavigationState,\n- ScreenOptions: {} = {},\n- EventMap: EventMapBase = EventMapCore<State>,\n+ State: NavigationState,\n+ ScreenOptions: {},\n+ EventMap: EventMapBase,\n+ NavigatorProps: BaseNavigatorProps<ScreenOptions>,\n> = <ParamList: ParamListBase>() => {|\nScreen: ScreenComponent<\nParamList,\n@@ -465,12 +458,7 @@ declare module '@react-navigation/bottom-tabs' {\nScreenOptions,\nEventMap,\n>,\n- Navigator: NavigatorComponent<\n- ParamList,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n+ Navigator: React$ComponentType<NavigatorProps>,\n|};\n//---------------------------------------------------------------------------\n@@ -802,7 +790,7 @@ declare module '@react-navigation/bottom-tabs' {\n// React Navigation libdef.\n//---------------------------------------------------------------------------\n- declare export type BottomTabNavigationOptions = $Shape<{|\n+ declare export type BottomTabOptions = $Shape<{|\ntitle: string,\ntabBarLabel:\n| string\n@@ -828,7 +816,7 @@ declare module '@react-navigation/bottom-tabs' {\ndeclare export type BottomTabNavigationProp<\nParamList: ParamListBase = ParamListBase,\nRouteName: $Keys<ParamList> = string,\n- Options: {} = BottomTabNavigationOptions,\n+ Options: {} = BottomTabOptions,\nEventMap: EventMapBase = BottomTabNavigationEventMap,\n> = {|\n...$Exact<NavigationProp<\n@@ -849,7 +837,7 @@ declare module '@react-navigation/bottom-tabs' {\nParamListBase,\nstring,\nTabNavigationState,\n- BottomTabNavigationOptions,\n+ BottomTabOptions,\n>;\ndeclare export type BottomTabBarOptions = $Shape<{|\n@@ -879,6 +867,21 @@ declare module '@react-navigation/bottom-tabs' {\nonPress?: (MouseEvent | PressEvent) => void,\n|};\n+ declare export type BottomTabBarProps = {|\n+ state: TabNavigationState,\n+ navigation: BottomTabNavigationProp<>,\n+ descriptors: {| [key: string]: BottomTabDescriptor |},\n+ ...BottomTabBarOptions,\n+ |}\n+\n+ declare export type TabNavigatorProps = {|\n+ ...$Exact<BaseNavigatorProps<BottomTabOptions>>,\n+ ...TabRouterOptions,\n+ lazy?: boolean,\n+ tabBar?: BottomTabBarProps => React$Node,\n+ tabBarOptions?: BottomTabBarOptions,\n+ |};\n+\n//---------------------------------------------------------------------------\n// SECTION 4: EXPORTED MODULE\n// This is the only section that types exports. Other sections export types,\n@@ -887,15 +890,11 @@ declare module '@react-navigation/bottom-tabs' {\ndeclare export var createBottomTabNavigator: CreateNavigator<\nTabNavigationState,\n- BottomTabNavigationOptions,\n+ BottomTabOptions,\nBottomTabNavigationEventMap,\n+ TabNavigatorProps,\n>;\n- declare export var BottomTabBar: React$ComponentType<{|\n- state: TabNavigationState,\n- navigation: BottomTabNavigationProp<>,\n- descriptors: {| [key: string]: BottomTabDescriptor |},\n- ...BottomTabBarOptions,\n- |}>;\n+ declare export var BottomTabBar: React$ComponentType<BottomTabBarProps>;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"diff": "@@ -437,27 +437,20 @@ declare module '@react-navigation/native' {\nEventMap,\n>) => React$Node;\n- declare export type NavigatorComponent<\n- ParamList: ParamListBase,\n- State: NavigationState = NavigationState,\n- ScreenOptions: {} = {},\n- EventMap: EventMapBase = EventMapCore<State>,\n- > = React$ComponentType<{\n+ declare export type BaseNavigatorProps<ScreenOptions: {}> = {\n...DefaultRouterOptions,\nchildren?: React.Node,\nscreenOptions?:\n| ScreenOptions\n- | ({|\n- route: RouteProp<ParamList, $Keys<ParamList>>,\n- navigation: any,\n- |}) => ScreenOptions,\n+ | ({| route: LeafRoute<>, navigation: any |}) => ScreenOptions,\n...\n- }>;\n+ };\ndeclare export type CreateNavigator<\n- State: NavigationState = NavigationState,\n- ScreenOptions: {} = {},\n- EventMap: EventMapBase = EventMapCore<State>,\n+ State: NavigationState,\n+ ScreenOptions: {},\n+ EventMap: EventMapBase,\n+ NavigatorProps: BaseNavigatorProps<ScreenOptions>,\n> = <ParamList: ParamListBase>() => {|\nScreen: ScreenComponent<\nParamList,\n@@ -465,12 +458,7 @@ declare module '@react-navigation/native' {\nScreenOptions,\nEventMap,\n>,\n- Navigator: NavigatorComponent<\n- ParamList,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n+ Navigator: React$ComponentType<NavigatorProps>,\n|};\n//---------------------------------------------------------------------------\n@@ -522,8 +510,11 @@ declare module '@react-navigation/native' {\ndeclare export var createNavigatorFactory: <\nState: NavigationState,\nScreenOptions: {},\n- EventMap: EventMapBase = EventMapCore<State>,\n- >(navigator: any) => CreateNavigator<State, ScreenOptions, EventMap>;\n+ EventMap: EventMapBase,\n+ NavigatorProps: BaseNavigatorProps<ScreenOptions>,\n+ >(\n+ navigator: React$ComponentType<NavigatorProps>,\n+ ) => CreateNavigator<State, ScreenOptions, EventMap, NavigatorProps>;\ndeclare export var StackRouter: RouterFactory<\nStackNavigationState,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"diff": "@@ -437,27 +437,20 @@ declare module '@react-navigation/stack' {\nEventMap,\n>) => React$Node;\n- declare export type NavigatorComponent<\n- ParamList: ParamListBase,\n- State: NavigationState = NavigationState,\n- ScreenOptions: {} = {},\n- EventMap: EventMapBase = EventMapCore<State>,\n- > = React$ComponentType<{\n+ declare export type BaseNavigatorProps<ScreenOptions: {}> = {\n...DefaultRouterOptions,\nchildren?: React.Node,\nscreenOptions?:\n| ScreenOptions\n- | ({|\n- route: RouteProp<ParamList, $Keys<ParamList>>,\n- navigation: any,\n- |}) => ScreenOptions,\n+ | ({| route: LeafRoute<>, navigation: any |}) => ScreenOptions,\n...\n- }>;\n+ };\ndeclare export type CreateNavigator<\n- State: NavigationState = NavigationState,\n- ScreenOptions: {} = {},\n- EventMap: EventMapBase = EventMapCore<State>,\n+ State: NavigationState,\n+ ScreenOptions: {},\n+ EventMap: EventMapBase,\n+ NavigatorProps: BaseNavigatorProps<ScreenOptions>,\n> = <ParamList: ParamListBase>() => {|\nScreen: ScreenComponent<\nParamList,\n@@ -465,12 +458,7 @@ declare module '@react-navigation/stack' {\nScreenOptions,\nEventMap,\n>,\n- Navigator: NavigatorComponent<\n- ParamList,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n+ Navigator: React$ComponentType<NavigatorProps>,\n|};\n//---------------------------------------------------------------------------\n@@ -1016,6 +1004,18 @@ declare module '@react-navigation/stack' {\nprops: StackHeaderInterpolationProps,\n) => StackHeaderInterpolatedStyle;\n+ declare type StackNavigationProps = {|\n+ mode?: 'card' | 'modal',\n+ headerMode?: 'float' | 'screen' | 'none',\n+ keyboardHandlingEnabled?: boolean,\n+ |};\n+\n+ declare export type StackNavigatorProps = {|\n+ ...$Exact<BaseNavigatorProps<StackOptions>>,\n+ ...StackRouterOptions,\n+ ...StackNavigationProps,\n+ |};\n+\n//---------------------------------------------------------------------------\n// SECTION 4: EXPORTED MODULE\n// This is the only section that types exports. Other sections export types,\n@@ -1023,9 +1023,7 @@ declare module '@react-navigation/stack' {\n//---------------------------------------------------------------------------\ndeclare export var StackView: React$ComponentType<{|\n- mode?: 'card' | 'modal',\n- headerMode?: 'float' | 'screen' | 'none',\n- keyboardHandlingEnabled?: boolean,\n+ ...StackNavigationProps,\nstate: StackNavigationState,\nnavigation: StackNavigationProp<>,\ndescriptors: {| [key: string]: StackDescriptor |},\n@@ -1036,6 +1034,7 @@ declare module '@react-navigation/stack' {\nStackNavigationState,\nStackOptions,\nStackNavigationEventMap,\n+ StackNavigatorProps,\n>;\ndeclare export var HeaderBackButton: any;\ndeclare export var Header: any;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-navigator.react.js",
"new_path": "native/navigation/overlay-navigator.react.js",
"diff": "// @flow\n-import type { StackNavigationState } from '@react-navigation/stack';\n+import type {\n+ StackNavigationState,\n+ BaseNavigatorProps,\n+} from '@react-navigation/stack';\nimport * as React from 'react';\nimport { View, StyleSheet } from 'react-native';\n@@ -22,8 +25,9 @@ import { scrollBlockingChatModals } from './route-names';\nconst { Value, timing, cond, call, lessOrEq, block } = Animated;\n/* eslint-enable import/no-named-as-default-member */\n-const OverlayNavigator = React.memo<any>(\n- ({ initialRouteName, children, screenOptions }) => {\n+type Props = $Exact<BaseNavigatorProps<{||}>>;\n+const OverlayNavigator = React.memo<Props>(\n+ ({ initialRouteName, children, screenOptions }: Props) => {\nconst { state, descriptors, navigation } = useNavigationBuilder(\nOverlayRouter,\n{\n@@ -370,6 +374,7 @@ const createOverlayNavigator = createNavigatorFactory<\nStackNavigationState,\n{||},\n{||},\n+ Props,\n>(OverlayNavigator);\nconst styles = StyleSheet.create({\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/root-navigator.react.js",
"new_path": "native/navigation/root-navigator.react.js",
"diff": "@@ -13,6 +13,7 @@ import {\ntype StackNavigationState,\ntype StackOptions,\ntype StackNavigationEventMap,\n+ type StackNavigatorProps,\n} from '@react-navigation/stack';\nimport NavigationBuilderContext from '@react-navigation/core/src/NavigationBuilderContext';\nimport invariant from 'invariant';\n@@ -55,7 +56,12 @@ export type RootNavigationProp<\nRouteName: $Keys<ScreenParamList> = $Keys<ScreenParamList>,\n> = RootRouterNavigationProp<ScreenParamList, RouteName>;\n-function RootNavigator({ initialRouteName, children, screenOptions, ...rest }) {\n+function RootNavigator({\n+ initialRouteName,\n+ children,\n+ screenOptions,\n+ ...rest\n+}: StackNavigatorProps) {\nconst { state, descriptors, navigation } = useNavigationBuilder(RootRouter, {\ninitialRouteName,\nchildren,\n@@ -86,6 +92,7 @@ const createRootNavigator = createNavigatorFactory<\nStackNavigationState,\nStackOptions,\nStackNavigationEventMap,\n+ StackNavigatorProps,\n>(RootNavigator);\nconst baseTransitionPreset = Platform.select({\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Type navigator props for React Nav |
129,187 | 27.05.2020 15:40:11 | 14,400 | c620b3ddccf760882652559901cdfdef3432f139 | [native] Type useNavigationBuilder for React Nav
And fix some any-typing | [
{
"change_type": "MODIFY",
"old_path": "native/chat/chat-router.js",
"new_path": "native/chat/chat-router.js",
"diff": "@@ -63,8 +63,8 @@ export type ChatRouterNavigationAction =\n| PushNewThreadAction;\nexport type ChatRouterNavigationProp<\n- ParamList: ParamListBase,\n- RouteName: string,\n+ ParamList: ParamListBase = ParamListBase,\n+ RouteName: string = string,\n> = {|\n...StackNavigationProp<ParamList, RouteName>,\n+clearScreens: (routeNames: $ReadOnlyArray<string>) => void,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/chat.react.js",
"new_path": "native/chat/chat.react.js",
"diff": "@@ -40,12 +40,14 @@ import MessageListHeaderTitle from './message-list-header-title.react';\nimport ThreadSettingsButton from './thread-settings-button.react';\nimport { InputStateContext } from '../input/input-state';\n+type ChatNavigatorProps = StackNavigatorProps<ChatRouterNavigationProp<>>;\n+\nfunction ChatNavigator({\ninitialRouteName,\nchildren,\nscreenOptions,\n...rest\n-}: StackNavigatorProps) {\n+}: ChatNavigatorProps) {\nconst { state, descriptors, navigation } = useNavigationBuilder(ChatRouter, {\ninitialRouteName,\nchildren,\n@@ -80,7 +82,8 @@ const createChatNavigator = createNavigatorFactory<\nStackNavigationState,\nStackOptions,\nStackNavigationEventMap,\n- StackNavigatorProps,\n+ ChatRouterNavigationProp<>,\n+ ChatNavigatorProps,\n>(ChatNavigator);\nconst header = props => <ChatHeader {...props} />;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"diff": "@@ -369,6 +369,7 @@ declare module '@react-navigation/bottom-tabs' {\ndeclare type BaseScreenProps<\nParamList: ParamListBase,\n+ NavProp,\nRouteName: $Keys<ParamList> = string,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\n@@ -379,19 +380,20 @@ declare module '@react-navigation/bottom-tabs' {\n| ScreenOptions\n| ({|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: any,\n+ navigation: NavProp,\n|}) => ScreenOptions,\nlisteners?:\n| ScreenListeners<EventMap, State>\n| ({|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: any,\n+ navigation: NavProp,\n|}) => ScreenListeners<EventMap, State>,\ninitialParams?: $Shape<$ElementType<ParamList, RouteName>>,\n|};\ndeclare export type ScreenProps<\nParamList: ParamListBase,\n+ NavProp,\nRouteName: $Keys<ParamList> = string,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\n@@ -400,6 +402,7 @@ declare module '@react-navigation/bottom-tabs' {\n| {|\n...BaseScreenProps<\nParamList,\n+ NavProp,\nRouteName,\nState,\nScreenOptions,\n@@ -407,12 +410,13 @@ declare module '@react-navigation/bottom-tabs' {\n>,\ncomponent: React$ComponentType<{|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: any,\n+ navigation: NavProp,\n|}>,\n|}\n| {|\n...BaseScreenProps<\nParamList,\n+ NavProp,\nRouteName,\nState,\nScreenOptions,\n@@ -420,7 +424,7 @@ declare module '@react-navigation/bottom-tabs' {\n>,\nchildren: ({|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: any,\n+ navigation: NavProp,\n|}) => React$Node,\n|};\n@@ -429,28 +433,34 @@ declare module '@react-navigation/bottom-tabs' {\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\nEventMap: EventMapBase = EventMapCore<State>,\n- > = <RouteName: $Keys<ParamList>>(props: ScreenProps<\n+ > = <RouteName: $Keys<ParamList>, NavProp>(props: ScreenProps<\nParamList,\n+ NavProp,\nRouteName,\nState,\nScreenOptions,\nEventMap,\n>) => React$Node;\n- declare export type BaseNavigatorProps<ScreenOptions: {}> = {\n- ...DefaultRouterOptions,\n+ declare type BaseNonRouterNavigatorProps<ScreenOptions: {}, NavProp> = {\nchildren?: React.Node,\nscreenOptions?:\n| ScreenOptions\n| ({| route: LeafRoute<>, navigation: any |}) => ScreenOptions,\n...\n};\n+ declare export type BaseNavigatorProps<ScreenOptions: {}, NavProp> = {\n+ ...DefaultRouterOptions,\n+ ...BaseNonRouterNavigatorProps<ScreenOptions, NavProp>,\n+ ...\n+ };\ndeclare export type CreateNavigator<\nState: NavigationState,\nScreenOptions: {},\nEventMap: EventMapBase,\n- NavigatorProps: BaseNavigatorProps<ScreenOptions>,\n+ NavProp,\n+ NavigatorProps: BaseNavigatorProps<ScreenOptions, NavProp>,\n> = <ParamList: ParamListBase>() => {|\nScreen: ScreenComponent<\nParamList,\n@@ -874,8 +884,8 @@ declare module '@react-navigation/bottom-tabs' {\n...BottomTabBarOptions,\n|}\n- declare export type TabNavigatorProps = {|\n- ...$Exact<BaseNavigatorProps<BottomTabOptions>>,\n+ declare export type TabNavigatorProps<NavProp> = {|\n+ ...$Exact<BaseNavigatorProps<BottomTabOptions, NavProp>>,\n...TabRouterOptions,\nlazy?: boolean,\ntabBar?: BottomTabBarProps => React$Node,\n@@ -892,7 +902,8 @@ declare module '@react-navigation/bottom-tabs' {\nTabNavigationState,\nBottomTabOptions,\nBottomTabNavigationEventMap,\n- TabNavigatorProps,\n+ BottomTabNavigationProp<>,\n+ TabNavigatorProps<BottomTabNavigationProp<>>,\n>;\ndeclare export var BottomTabBar: React$ComponentType<BottomTabBarProps>;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"diff": "@@ -369,6 +369,7 @@ declare module '@react-navigation/native' {\ndeclare type BaseScreenProps<\nParamList: ParamListBase,\n+ NavProp,\nRouteName: $Keys<ParamList> = string,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\n@@ -379,19 +380,20 @@ declare module '@react-navigation/native' {\n| ScreenOptions\n| ({|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: any,\n+ navigation: NavProp,\n|}) => ScreenOptions,\nlisteners?:\n| ScreenListeners<EventMap, State>\n| ({|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: any,\n+ navigation: NavProp,\n|}) => ScreenListeners<EventMap, State>,\ninitialParams?: $Shape<$ElementType<ParamList, RouteName>>,\n|};\ndeclare export type ScreenProps<\nParamList: ParamListBase,\n+ NavProp,\nRouteName: $Keys<ParamList> = string,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\n@@ -400,6 +402,7 @@ declare module '@react-navigation/native' {\n| {|\n...BaseScreenProps<\nParamList,\n+ NavProp,\nRouteName,\nState,\nScreenOptions,\n@@ -407,12 +410,13 @@ declare module '@react-navigation/native' {\n>,\ncomponent: React$ComponentType<{|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: any,\n+ navigation: NavProp,\n|}>,\n|}\n| {|\n...BaseScreenProps<\nParamList,\n+ NavProp,\nRouteName,\nState,\nScreenOptions,\n@@ -420,7 +424,7 @@ declare module '@react-navigation/native' {\n>,\nchildren: ({|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: any,\n+ navigation: NavProp,\n|}) => React$Node,\n|};\n@@ -429,20 +433,25 @@ declare module '@react-navigation/native' {\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\nEventMap: EventMapBase = EventMapCore<State>,\n- > = <RouteName: $Keys<ParamList>>(props: ScreenProps<\n+ > = <RouteName: $Keys<ParamList>, NavProp>(props: ScreenProps<\nParamList,\n+ NavProp,\nRouteName,\nState,\nScreenOptions,\nEventMap,\n>) => React$Node;\n- declare export type BaseNavigatorProps<ScreenOptions: {}> = {\n- ...DefaultRouterOptions,\n+ declare type BaseNonRouterNavigatorProps<ScreenOptions: {}, NavProp> = {\nchildren?: React.Node,\nscreenOptions?:\n| ScreenOptions\n- | ({| route: LeafRoute<>, navigation: any |}) => ScreenOptions,\n+ | ({| route: LeafRoute<>, navigation: NavProp |}) => ScreenOptions,\n+ ...\n+ };\n+ declare export type BaseNavigatorProps<ScreenOptions: {}, NavProp> = {\n+ ...DefaultRouterOptions,\n+ ...BaseNonRouterNavigatorProps<ScreenOptions, NavProp>,\n...\n};\n@@ -450,7 +459,8 @@ declare module '@react-navigation/native' {\nState: NavigationState,\nScreenOptions: {},\nEventMap: EventMapBase,\n- NavigatorProps: BaseNavigatorProps<ScreenOptions>,\n+ NavProp,\n+ NavigatorProps: BaseNavigatorProps<ScreenOptions, NavProp>,\n> = <ParamList: ParamListBase>() => {|\nScreen: ScreenComponent<\nParamList,\n@@ -511,10 +521,11 @@ declare module '@react-navigation/native' {\nState: NavigationState,\nScreenOptions: {},\nEventMap: EventMapBase,\n- NavigatorProps: BaseNavigatorProps<ScreenOptions>,\n+ NavProp,\n+ NavigatorProps: BaseNavigatorProps<ScreenOptions, NavProp>,\n>(\nnavigator: React$ComponentType<NavigatorProps>,\n- ) => CreateNavigator<State, ScreenOptions, EventMap, NavigatorProps>;\n+ ) => CreateNavigator<State, ScreenOptions, EventMap, NavProp, NavigatorProps>;\ndeclare export var StackRouter: RouterFactory<\nStackNavigationState,\n@@ -528,7 +539,26 @@ declare module '@react-navigation/native' {\nTabRouterOptions,\n>;\n- declare export var useNavigationBuilder: any;\n+ declare export var useNavigationBuilder: <\n+ State: NavigationState,\n+ Action: GenericNavigationAction,\n+ ScreenOptions: {},\n+ RouterOptions: DefaultRouterOptions,\n+ NavProp,\n+ >(\n+ routerFactory: RouterFactory<State, Action, RouterOptions>,\n+ options: {|\n+ ...$Exact<RouterOptions>,\n+ ...$Exact<BaseNonRouterNavigatorProps<ScreenOptions, NavProp>>,\n+ |},\n+ ) => {|\n+ +state: State,\n+ +descriptors: {|\n+ [key: string]: Descriptor<ParamListBase, string, State, ScreenOptions>\n+ |},\n+ +navigation: NavProp,\n+ |};\n+\ndeclare export var NavigationHelpersContext: any;\ndeclare export var NavigationContainer: any;\ndeclare export var DefaultTheme: any;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"diff": "@@ -369,6 +369,7 @@ declare module '@react-navigation/stack' {\ndeclare type BaseScreenProps<\nParamList: ParamListBase,\n+ NavProp,\nRouteName: $Keys<ParamList> = string,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\n@@ -379,19 +380,20 @@ declare module '@react-navigation/stack' {\n| ScreenOptions\n| ({|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: any,\n+ navigation: NavProp,\n|}) => ScreenOptions,\nlisteners?:\n| ScreenListeners<EventMap, State>\n| ({|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: any,\n+ navigation: NavProp,\n|}) => ScreenListeners<EventMap, State>,\ninitialParams?: $Shape<$ElementType<ParamList, RouteName>>,\n|};\ndeclare export type ScreenProps<\nParamList: ParamListBase,\n+ NavProp,\nRouteName: $Keys<ParamList> = string,\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\n@@ -400,6 +402,7 @@ declare module '@react-navigation/stack' {\n| {|\n...BaseScreenProps<\nParamList,\n+ NavProp,\nRouteName,\nState,\nScreenOptions,\n@@ -407,12 +410,13 @@ declare module '@react-navigation/stack' {\n>,\ncomponent: React$ComponentType<{|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: any,\n+ navigation: NavProp,\n|}>,\n|}\n| {|\n...BaseScreenProps<\nParamList,\n+ NavProp,\nRouteName,\nState,\nScreenOptions,\n@@ -420,7 +424,7 @@ declare module '@react-navigation/stack' {\n>,\nchildren: ({|\nroute: RouteProp<ParamList, RouteName>,\n- navigation: any,\n+ navigation: NavProp,\n|}) => React$Node,\n|};\n@@ -429,20 +433,25 @@ declare module '@react-navigation/stack' {\nState: NavigationState = NavigationState,\nScreenOptions: {} = {},\nEventMap: EventMapBase = EventMapCore<State>,\n- > = <RouteName: $Keys<ParamList>>(props: ScreenProps<\n+ > = <RouteName: $Keys<ParamList>, NavProp>(props: ScreenProps<\nParamList,\n+ NavProp,\nRouteName,\nState,\nScreenOptions,\nEventMap,\n>) => React$Node;\n- declare export type BaseNavigatorProps<ScreenOptions: {}> = {\n- ...DefaultRouterOptions,\n+ declare type BaseNonRouterNavigatorProps<ScreenOptions: {}, NavProp> = {\nchildren?: React.Node,\nscreenOptions?:\n| ScreenOptions\n- | ({| route: LeafRoute<>, navigation: any |}) => ScreenOptions,\n+ | ({| route: LeafRoute<>, navigation: NavProp |}) => ScreenOptions,\n+ ...\n+ };\n+ declare export type BaseNavigatorProps<ScreenOptions: {}, NavProp> = {\n+ ...DefaultRouterOptions,\n+ ...BaseNonRouterNavigatorProps<ScreenOptions, NavProp>,\n...\n};\n@@ -450,7 +459,8 @@ declare module '@react-navigation/stack' {\nState: NavigationState,\nScreenOptions: {},\nEventMap: EventMapBase,\n- NavigatorProps: BaseNavigatorProps<ScreenOptions>,\n+ NavProp,\n+ NavigatorProps: BaseNavigatorProps<ScreenOptions, NavProp>,\n> = <ParamList: ParamListBase>() => {|\nScreen: ScreenComponent<\nParamList,\n@@ -1010,8 +1020,8 @@ declare module '@react-navigation/stack' {\nkeyboardHandlingEnabled?: boolean,\n|};\n- declare export type StackNavigatorProps = {|\n- ...$Exact<BaseNavigatorProps<StackOptions>>,\n+ declare export type StackNavigatorProps<NavProp> = {|\n+ ...$Exact<BaseNavigatorProps<StackOptions, NavProp>>,\n...StackRouterOptions,\n...StackNavigationProps,\n|};\n@@ -1029,13 +1039,15 @@ declare module '@react-navigation/stack' {\ndescriptors: {| [key: string]: StackDescriptor |},\n|}>;\n- declare export var HeaderTitle: any;\ndeclare export var createStackNavigator: CreateNavigator<\nStackNavigationState,\nStackOptions,\nStackNavigationEventMap,\n- StackNavigatorProps,\n+ StackNavigationProp<>,\n+ StackNavigatorProps<StackNavigationProp<>>,\n>;\n+\n+ declare export var HeaderTitle: any;\ndeclare export var HeaderBackButton: any;\ndeclare export var Header: any;\ndeclare export var TransitionPresets: any;\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-navigator.react.js",
"new_path": "native/navigation/overlay-navigator.react.js",
"diff": "@@ -4,6 +4,7 @@ import type {\nStackNavigationState,\nBaseNavigatorProps,\n} from '@react-navigation/stack';\n+import type { OverlayRouterNavigationProp } from './overlay-router';\nimport * as React from 'react';\nimport { View, StyleSheet } from 'react-native';\n@@ -25,7 +26,7 @@ import { scrollBlockingChatModals } from './route-names';\nconst { Value, timing, cond, call, lessOrEq, block } = Animated;\n/* eslint-enable import/no-named-as-default-member */\n-type Props = $Exact<BaseNavigatorProps<{||}>>;\n+type Props = $Exact<BaseNavigatorProps<{||}, OverlayRouterNavigationProp<>>>;\nconst OverlayNavigator = React.memo<Props>(\n({ initialRouteName, children, screenOptions }: Props) => {\nconst { state, descriptors, navigation } = useNavigationBuilder(\n@@ -374,6 +375,7 @@ const createOverlayNavigator = createNavigatorFactory<\nStackNavigationState,\n{||},\n{||},\n+ OverlayRouterNavigationProp<>,\nProps,\n>(OverlayNavigator);\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-router.js",
"new_path": "native/navigation/overlay-router.js",
"diff": "@@ -27,8 +27,8 @@ export type OverlayRouterNavigationAction =\n| ClearOverlayModalsAction;\nexport type OverlayRouterNavigationProp<\n- ParamList: ParamListBase,\n- RouteName: string,\n+ ParamList: ParamListBase = ParamListBase,\n+ RouteName: string = string,\n> = {|\n...StackNavigationProp<ParamList, RouteName, {||}, {||}>,\n+clearOverlayModals: (keys: $ReadOnlyArray<string>) => void,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/root-navigator.react.js",
"new_path": "native/navigation/root-navigator.react.js",
"diff": "@@ -52,16 +52,14 @@ if (Platform.OS !== 'android' || Platform.Version >= 21) {\nenableScreens();\n}\n-export type RootNavigationProp<\n- RouteName: $Keys<ScreenParamList> = $Keys<ScreenParamList>,\n-> = RootRouterNavigationProp<ScreenParamList, RouteName>;\n+type RootNavigatorProps = StackNavigatorProps<RootRouterNavigationProp<>>;\nfunction RootNavigator({\ninitialRouteName,\nchildren,\nscreenOptions,\n...rest\n-}: StackNavigatorProps) {\n+}: RootNavigatorProps) {\nconst { state, descriptors, navigation } = useNavigationBuilder(RootRouter, {\ninitialRouteName,\nchildren,\n@@ -92,7 +90,8 @@ const createRootNavigator = createNavigatorFactory<\nStackNavigationState,\nStackOptions,\nStackNavigationEventMap,\n- StackNavigatorProps,\n+ RootRouterNavigationProp<>,\n+ RootNavigatorProps,\n>(RootNavigator);\nconst baseTransitionPreset = Platform.select({\n@@ -120,7 +119,6 @@ const transitionPreset = {\n},\n};\n-const Root = createRootNavigator<RootParamList>();\nconst defaultScreenOptions = {\ngestureEnabled: Platform.OS === 'ios',\nanimationEnabled: Platform.OS !== 'web',\n@@ -133,6 +131,12 @@ const disableGesturesScreenOptions = {\nconst modalOverlayScreenOptions = {\ncardOverlayEnabled: true,\n};\n+\n+export type RootNavigationProp<\n+ RouteName: $Keys<ScreenParamList> = $Keys<ScreenParamList>,\n+> = RootRouterNavigationProp<ScreenParamList, RouteName>;\n+\n+const Root = createRootNavigator<RootParamList>();\nconst RootComponent = () => {\nconst builderContext = React.useContext(NavigationBuilderContext);\ninvariant(\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/root-router.js",
"new_path": "native/navigation/root-router.js",
"diff": "@@ -57,8 +57,8 @@ export type RootRouterNavigationAction =\n| SetNavStateAction;\nexport type RootRouterNavigationProp<\n- ParamList: ParamListBase,\n- RouteName: string,\n+ ParamList: ParamListBase = ParamListBase,\n+ RouteName: string = string,\n> = {|\n...StackNavigationProp<ParamList, RouteName>,\n+logIn: () => void,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Type useNavigationBuilder for React Nav
And fix some any-typing |
129,187 | 27.05.2020 20:09:15 | 14,400 | ee59eb06c2bc96409ca81e8a83580071288ea0a6 | [native] Fix Descriptor type to match between React Nav libdefs | [
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/bottom-tabs_vx.x.x.js",
"diff": "@@ -489,6 +489,15 @@ declare module '@react-navigation/bottom-tabs' {\nNavigator: React$ComponentType<NavigatorProps>,\n|};\n+ declare export type Descriptor<\n+ NavProp,\n+ ScreenOptions: {} = {},\n+ > = {|\n+ +render: () => React$Node,\n+ +options: $ReadOnly<ScreenOptions>,\n+ +navigation: NavProp,\n+ |};\n+\n//---------------------------------------------------------------------------\n// SECTION 2: SHARED TYPE DEFINITIONS\n// This section too is copy-pasted, but it's not identical across all React\n@@ -787,24 +796,6 @@ declare module '@react-navigation/bottom-tabs' {\n* used below in section 3, but also in other libdefs.\n*/\n- declare export type Descriptor<\n- ParamList: ParamListBase,\n- RouteName: $Keys<ParamList> = string,\n- State: NavigationState = NavigationState,\n- ScreenOptions: {} = {},\n- EventMap: EventMapBase = EventMapCore<State>,\n- > = {|\n- +render: () => React$Node,\n- +options: $ReadOnly<ScreenOptions>,\n- +navigation: NavigationProp<\n- ParamList,\n- RouteName,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n- |};\n-\ndeclare type EdgeInsets = {|\ntop: number,\nright: number,\n@@ -862,9 +853,7 @@ declare module '@react-navigation/bottom-tabs' {\n|};\ndeclare export type BottomTabDescriptor = Descriptor<\n- ParamListBase,\n- string,\n- TabNavigationState,\n+ BottomTabNavigationProp<ParamListBase, string>,\nBottomTabOptions,\n>;\n@@ -898,7 +887,7 @@ declare module '@react-navigation/bottom-tabs' {\ndeclare export type BottomTabBarProps = {|\nstate: TabNavigationState,\nnavigation: BottomTabNavigationProp<>,\n- descriptors: {| [key: string]: BottomTabDescriptor |},\n+ descriptors: {| +[key: string]: BottomTabDescriptor |},\n...BottomTabBarOptions,\n|}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/native_vx.x.x.js",
"diff": "@@ -489,6 +489,15 @@ declare module '@react-navigation/native' {\nNavigator: React$ComponentType<NavigatorProps>,\n|};\n+ declare export type Descriptor<\n+ NavProp,\n+ ScreenOptions: {} = {},\n+ > = {|\n+ +render: () => React$Node,\n+ +options: $ReadOnly<ScreenOptions>,\n+ +navigation: NavProp,\n+ |};\n+\n//---------------------------------------------------------------------------\n// SECTION 2: SHARED TYPE DEFINITIONS\n// This section too is copy-pasted, but it's not identical across all React\n@@ -607,9 +616,7 @@ declare module '@react-navigation/native' {\n|},\n) => {|\n+state: State,\n- +descriptors: {|\n- [key: string]: Descriptor<ParamListBase, string, State, ScreenOptions>\n- |},\n+ +descriptors: {| +[key: string]: Descriptor<NavProp, ScreenOptions> |},\n+navigation: NavProp,\n|};\n"
},
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/stack_vx.x.x.js",
"diff": "@@ -489,6 +489,15 @@ declare module '@react-navigation/stack' {\nNavigator: React$ComponentType<NavigatorProps>,\n|};\n+ declare export type Descriptor<\n+ NavProp,\n+ ScreenOptions: {} = {},\n+ > = {|\n+ +render: () => React$Node,\n+ +options: $ReadOnly<ScreenOptions>,\n+ +navigation: NavProp,\n+ |};\n+\n//---------------------------------------------------------------------------\n// SECTION 2: SHARED TYPE DEFINITIONS\n// This section too is copy-pasted, but it's not identical across all React\n@@ -787,24 +796,6 @@ declare module '@react-navigation/stack' {\n* used below in section 3, but also in other libdefs.\n*/\n- declare export type Descriptor<\n- ParamList: ParamListBase,\n- RouteName: $Keys<ParamList> = string,\n- State: NavigationState = NavigationState,\n- ScreenOptions: {} = {},\n- EventMap: EventMapBase = EventMapCore<State>,\n- > = {|\n- +render: () => React$Node,\n- +options: $ReadOnly<ScreenOptions>,\n- +navigation: NavigationProp<\n- ParamList,\n- RouteName,\n- State,\n- ScreenOptions,\n- EventMap,\n- >,\n- |};\n-\ndeclare type EdgeInsets = {|\ntop: number,\nright: number,\n@@ -819,9 +810,7 @@ declare module '@react-navigation/stack' {\n//---------------------------------------------------------------------------\ndeclare export type StackDescriptor = Descriptor<\n- ParamListBase,\n- string,\n- StackNavigationState,\n+ StackNavigationProp<ParamListBase, string>,\nStackOptions,\n>;\n@@ -1054,7 +1043,7 @@ declare module '@react-navigation/stack' {\n...StackNavigationProps,\nstate: StackNavigationState,\nnavigation: StackNavigationProp<>,\n- descriptors: {| [key: string]: StackDescriptor |},\n+ descriptors: {| +[key: string]: StackDescriptor |},\n|}>;\ndeclare export var createStackNavigator: CreateNavigator<\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Fix Descriptor type to match between React Nav libdefs |
129,187 | 28.05.2020 15:14:18 | 14,400 | deb6a4f1ab4a6aa8ec6247d29bc1623c634042e9 | Set up memberships table in create-db.js | [
{
"change_type": "MODIFY",
"old_path": "lib/facts/bots.json",
"new_path": "lib/facts/bots.json",
"diff": "{\n\"squadbot\": {\n\"userID\": \"5\",\n- \"ashoatThreadID\": \"83794\"\n+ \"staffThreadID\": \"83794\"\n}\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/creators/report-creator.js",
"new_path": "server/src/creators/report-creator.js",
"diff": "@@ -93,7 +93,7 @@ async function sendSquadbotMessage(\nawait createMessages(createBotViewer(squadbot.userID), [\n{\ntype: messageTypes.TEXT,\n- threadID: squadbot.ashoatThreadID,\n+ threadID: squadbot.staffThreadID,\ncreatorID: squadbot.userID,\ntime,\ntext: message,\n"
},
{
"change_type": "MODIFY",
"old_path": "server/src/scripts/create-db.js",
"new_path": "server/src/scripts/create-db.js",
"diff": "// @flow\n+import ashoat from 'lib/facts/ashoat';\n+import bots from 'lib/facts/bots';\n+import {\n+ makePermissionsBlob,\n+ makePermissionsForChildrenBlob,\n+} from 'lib/permissions/thread-permissions';\n+import { threadTypes } from 'lib/types/thread-types';\n+\nimport { setScriptContext } from './script-context';\nimport { endScript } from './utils';\nimport { dbQuery, SQL } from '../database';\n@@ -281,28 +289,60 @@ async function createTables() {\nasync function createUsers() {\nawait dbQuery(SQL`\nINSERT INTO ids (id, table_name)\n- VALUES (5, 'users'), (256, 'users');\n+ VALUES\n+ (${bots.squadbot.userID}, 'users'),\n+ (${ashoat.id}, 'users');\nINSERT INTO users (id, username, hash, email, email_verified, avatar,\ncreation_time)\nVALUES\n- (5, 'squadbot', '', 'squadbot@squadcal.org', 1, NULL, 1530049900980),\n- (256, 'ashoat', '', 'ashoat@gmail.com', 1, NULL, 1463588881886);\n+ (${bots.squadbot.userID}, 'squadbot', '', 'squadbot@squadcal.org', 1,\n+ NULL, 1530049900980),\n+ (${ashoat.id}, 'ashoat', '', ${ashoat.email}, 1,\n+ NULL, 1463588881886);\n`);\n}\nasync function createThreads() {\n- const ashoatSquadbotThreadDefaultRolePermissions = JSON.stringify(\n- getRolePermissionBlobsForChat().defaultPermissions,\n+ const staffSquadbotThreadRoleID = 118821;\n+ const defaultRolePermissions = getRolePermissionBlobsForChat()\n+ .defaultPermissions;\n+ const membershipPermissions = makePermissionsBlob(\n+ defaultRolePermissions,\n+ null,\n+ bots.squadbot.staffThreadID,\n+ threadTypes.CHAT_SECRET,\n);\n+ const membershipPermissionsString = JSON.stringify(membershipPermissions);\n+ const membershipChildPermissionsString = JSON.stringify(\n+ makePermissionsForChildrenBlob(membershipPermissions),\n+ );\n+ const subscriptionString = JSON.stringify({ home: true, pushNotifs: true });\nawait dbQuery(SQL`\nINSERT INTO ids (id, table_name)\n- VALUES (83794, 'threads'), (118821, 'roles');\n+ VALUES\n+ (${bots.squadbot.staffThreadID}, 'threads'),\n+ (${staffSquadbotThreadRoleID}, 'roles');\nINSERT INTO roles (id, thread, name, permissions, creation_time)\n- VALUES (118821, 83794, 'Members',\n- ${ashoatSquadbotThreadDefaultRolePermissions}, 1530049901882);\n+ VALUES\n+ (${staffSquadbotThreadRoleID}, ${bots.squadbot.staffThreadID},\n+ 'Members', ${JSON.stringify(defaultRolePermissions)}, 1530049901882);\nINSERT INTO threads (id, type, name, description, parent_thread_id,\ndefault_role, creator, creation_time, color)\n- VALUES (83794, 4, NULL, NULL, NULL, 118821, 5, 1530049901942, 'ef1a63');\n+ VALUES\n+ (${bots.squadbot.staffThreadID}, ${threadTypes.CHAT_SECRET}, NULL, NULL,\n+ NULL, ${staffSquadbotThreadRoleID}, ${bots.squadbot.userID},\n+ 1530049901942, 'ef1a63');\n+ INSERT INTO memberships (thread, user, role, permissions,\n+ permissions_for_children, creation_time, subscription, unread)\n+ VALUES\n+ (${bots.squadbot.staffThreadID}, ${bots.squadbot.userID},\n+ ${staffSquadbotThreadRoleID}, ${membershipPermissionsString},\n+ ${membershipChildPermissionsString}, 1530049902080,\n+ ${subscriptionString}, 0),\n+ (${bots.squadbot.staffThreadID}, ${ashoat.id},\n+ ${staffSquadbotThreadRoleID}, ${membershipPermissionsString},\n+ ${membershipChildPermissionsString}, 1530049902080,\n+ ${subscriptionString}, 0);\n`);\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | Set up memberships table in create-db.js |
129,187 | 28.05.2020 15:52:51 | 14,400 | ffb4bb6b693892253236559bbb8a1db90713050a | [native] Move navigation-utils to navigation folder | [
{
"change_type": "MODIFY",
"old_path": "native/chat/chat-router.js",
"new_path": "native/chat/chat-router.js",
"diff": "@@ -23,7 +23,7 @@ import {\nimport {\nremoveScreensFromStack,\ngetThreadIDFromRoute,\n-} from '../utils/navigation-utils';\n+} from '../navigation/navigation-utils';\nimport {\nclearScreensActionType,\nreplaceWithThreadActionType,\n"
},
{
"change_type": "MODIFY",
"old_path": "native/chat/thread-screen-pruner.react.js",
"new_path": "native/chat/thread-screen-pruner.react.js",
"diff": "@@ -10,7 +10,7 @@ import { NavContext } from '../navigation/navigation-context';\nimport {\ngetStateFromNavigatorRoute,\ngetThreadIDFromRoute,\n-} from '../utils/navigation-utils';\n+} from '../navigation/navigation-utils';\nimport { useActiveThread } from '../navigation/nav-selectors';\nimport { clearThreadsActionType } from '../navigation/action-types';\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/nav-selectors.js",
"new_path": "native/navigation/nav-selectors.js",
"diff": "@@ -30,7 +30,7 @@ import {\nimport {\ngetStateFromNavigatorRoute,\ngetThreadIDFromRoute,\n-} from '../utils/navigation-utils';\n+} from './navigation-utils';\nimport { NavContext } from './navigation-context';\nconst baseCreateIsForegroundSelector = (routeName: string) =>\n"
},
{
"change_type": "RENAME",
"old_path": "native/utils/navigation-utils.js",
"new_path": "native/navigation/navigation-utils.js",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/overlay-router.js",
"new_path": "native/navigation/overlay-router.js",
"diff": "@@ -13,7 +13,7 @@ import type {\nimport { StackRouter } from '@react-navigation/native';\n-import { removeScreensFromStack } from '../utils/navigation-utils';\n+import { removeScreensFromStack } from './navigation-utils';\nimport { clearOverlayModalsActionType } from './action-types';\ntype ClearOverlayModalsAction = {|\n"
},
{
"change_type": "MODIFY",
"old_path": "native/navigation/root-router.js",
"new_path": "native/navigation/root-router.js",
"diff": "@@ -16,7 +16,7 @@ import type {\nimport { StackRouter, CommonActions } from '@react-navigation/native';\nimport invariant from 'invariant';\n-import { removeScreensFromStack } from '../utils/navigation-utils';\n+import { removeScreensFromStack } from './navigation-utils';\nimport {\naccountModals,\nLoggedOutModalRouteName,\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Move navigation-utils to navigation folder |
129,187 | 28.05.2020 15:57:07 | 14,400 | 478e3676e297f0a8936abd531422e6a62d6d319b | [native] Check nav state validity in dev mode before using it
Fast Refresh somehow can lead React Navigation to clear the app route | [
{
"change_type": "MODIFY",
"old_path": "native/navigation/navigation-utils.js",
"new_path": "native/navigation/navigation-utils.js",
"diff": "@@ -11,6 +11,7 @@ import invariant from 'invariant';\nimport {\nComposeThreadRouteName,\n+ AppRouteName,\nthreadRoutes,\n} from '../navigation/route-names';\n@@ -138,6 +139,17 @@ function removeScreensFromStack<\n};\n}\n+function validNavState(state: PossiblyStaleNavigationState) {\n+ if (state.routes.length === 0) {\n+ return false;\n+ }\n+ const [firstRoute] = state.routes;\n+ if (firstRoute.name !== AppRouteName) {\n+ return false;\n+ }\n+ return true;\n+}\n+\nexport {\ngetStateFromNavigatorRoute,\ngetThreadIDFromParams,\n@@ -145,4 +157,5 @@ export {\ncurrentLeafRoute,\nfindRouteIndexWithKey,\nremoveScreensFromStack,\n+ validNavState,\n};\n"
},
{
"change_type": "MODIFY",
"old_path": "native/root.react.js",
"new_path": "native/root.react.js",
"diff": "@@ -44,6 +44,7 @@ import InputStateContainer from './input/input-state-container.react';\nimport './themes/fonts';\nimport LifecycleHandler from './lifecycle/lifecycle-handler.react';\nimport { DarkTheme, LightTheme } from './themes/navigation';\n+import { validNavState } from './navigation/navigation-utils';\nif (Platform.OS === 'android') {\nUIManager.setLayoutAnimationEnabledExperimental &&\n@@ -95,7 +96,10 @@ class Root extends React.PureComponent<Props, State> {\nnavStateAsyncStorageKey,\n);\nif (navStateString) {\n- initialState = JSON.parse(navStateString);\n+ const savedState = JSON.parse(navStateString);\n+ if (validNavState(savedState)) {\n+ initialState = savedState;\n+ }\n}\n} catch {}\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Check nav state validity in dev mode before using it
Fast Refresh somehow can lead React Navigation to clear the app route |
129,187 | 28.05.2020 15:57:53 | 14,400 | f945f54148a53968a5181af0f4c46e1a7480084e | [native] Use SafeAreaView instead of useSafeArea
Guaranteed synchronous instead of JS-thread asynchronous | [
{
"change_type": "MODIFY",
"old_path": "native/components/safe-area-view.react.js",
"new_path": "native/components/safe-area-view.react.js",
"diff": "// @flow\n-import type { ViewStyle } from '../types/styles';\n-\nimport * as React from 'react';\nimport { View } from 'react-native';\n-import { useSafeArea } from 'react-native-safe-area-context';\n+import { SafeAreaView } from 'react-native-safe-area-context';\n+\n+const edges = ['top'];\n-type Props = {|\n- style?: ViewStyle,\n- children?: React.Node,\n-|};\n-function InsetSafeAreaView(props: Props) {\n- const insets = useSafeArea();\n- const style = [{ paddingTop: insets.top }, props.style];\n- return <View style={style}>{props.children}</View>;\n+function InsetSafeAreaView(props: React.ElementProps<typeof View>) {\n+ return <SafeAreaView edges={edges} {...props} />;\n}\nexport default InsetSafeAreaView;\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Use SafeAreaView instead of useSafeArea
Guaranteed synchronous instead of JS-thread asynchronous |
129,187 | 28.05.2020 17:31:37 | 14,400 | cfbfb8e58643ffddfcf62feb2b6e333db86e864f | [native] Don't use string as action for NAV/@@INIT | [
{
"change_type": "MODIFY",
"old_path": "native/root.react.js",
"new_path": "native/root.react.js",
"diff": "@@ -52,6 +52,8 @@ if (Platform.OS === 'android') {\n}\nconst navStateAsyncStorageKey = 'navState';\n+const navInitAction = Object.freeze({ type: 'NAV/@@INIT' });\n+const navUnknownAction = Object.freeze({ type: 'NAV/@@UNKNOWN' });\ntype Props = {\n// Redux state\n@@ -108,7 +110,7 @@ class Root extends React.PureComponent<Props, State> {\n}\nthis.navState = initialState;\nthis.setNavContext();\n- actionLogger.addOtherAction('navState', 'NAV/@@INIT', null, initialState);\n+ actionLogger.addOtherAction('navState', navInitAction, null, initialState);\nthis.setState({ initialState });\n}\n@@ -188,7 +190,7 @@ class Root extends React.PureComponent<Props, State> {\nconst { queuedActions } = this;\nthis.queuedActions = [];\nif (queuedActions.length === 0) {\n- queuedActions.push('NAV/@@UNKNOWN');\n+ queuedActions.push(navUnknownAction);\n}\nfor (let action of queuedActions) {\nactionLogger.addOtherAction('navState', action, prevState, state);\n@@ -230,7 +232,7 @@ class Root extends React.PureComponent<Props, State> {\nonNavAction = (action: GenericNavigationAction | string) => {\nif (typeof action === 'string') {\n- this.queuedActions.push(`NAV/${action}`);\n+ this.queuedActions.push({ type: `NAV/${action}` });\n} else if (\naction &&\ntypeof action === 'object' &&\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Don't use string as action for NAV/@@INIT |
129,187 | 28.05.2020 17:41:46 | 14,400 | 65ebd7e224f96b7ee0e4b8d96f47d813bd64adfc | [native] Refine the type of NavigationBuilderContext
This concludes the process of typing the surface of React Nav 5 that this project actually uses | [
{
"change_type": "MODIFY",
"old_path": "native/flow-typed/npm/@react-navigation/core_vx.x.x.js",
"new_path": "native/flow-typed/npm/@react-navigation/core_vx.x.x.js",
"diff": "* needed.\n*/\ndeclare module '@react-navigation/core/src/NavigationBuilderContext' {\n- declare module.exports: any;\n+\n+ declare type GenericNavigationAction = {|\n+ +type: string,\n+ +payload?: { +[key: string]: mixed },\n+ +source?: string,\n+ +target?: string,\n+ |};\n+\n+ declare export default React$Context<{\n+ trackAction: (action: GenericNavigationAction) => void,\n+ ...\n+ }>;\n+\n}\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Refine the type of NavigationBuilderContext
This concludes the process of typing the surface of React Nav 5 that this project actually uses |
129,187 | 28.05.2020 22:59:06 | 14,400 | 3a487f7903e18908c142e124e822dfcf99a3d0d0 | [native] Fix ComposeThread create thread button display | [
{
"change_type": "MODIFY",
"old_path": "native/chat/compose-thread.react.js",
"new_path": "native/chat/compose-thread.react.js",
"diff": "@@ -144,7 +144,7 @@ class ComposeThread extends React.PureComponent<Props, State> {\n<LinkButton\ntext=\"Create\"\nonPress={this.onPressCreateThread}\n- disabled={enabled}\n+ disabled={!enabled}\n/>\n),\n});\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Fix ComposeThread create thread button display |
129,187 | 29.05.2020 00:17:12 | 14,400 | 88f4a76730169a1936080c2bc10ddb3950d4b69f | [native] Clear navigation state when purging Redux | [
{
"change_type": "MODIFY",
"old_path": "native/more/dev-tools.react.js",
"new_path": "native/more/dev-tools.react.js",
"diff": "@@ -10,6 +10,7 @@ import { View, Text, ScrollView, Platform } from 'react-native';\nimport ExitApp from 'react-native-exit-app';\nimport Icon from 'react-native-vector-icons/Ionicons';\nimport PropTypes from 'prop-types';\n+import AsyncStorage from '@react-native-community/async-storage';\nimport { connect } from 'lib/utils/redux-utils';\nimport { setURLPrefix } from 'lib/utils/url-utils';\n@@ -25,6 +26,7 @@ import {\ncolorsSelector,\nstyleSelector,\n} from '../themes/colors';\n+import { navStateAsyncStorageKey } from '../navigation/persistance';\nconst ServerIcon = () => (\n<Icon name=\"md-checkmark\" size={20} color=\"#008800\" style={styles.icon} />\n@@ -164,7 +166,10 @@ class DevTools extends React.PureComponent<Props> {\n};\nonPressWipe = async () => {\n- getPersistor().purge();\n+ await Promise.all([\n+ getPersistor().purge(),\n+ __DEV__ ? AsyncStorage.removeItem(navStateAsyncStorageKey) : null,\n+ ]);\nawait sleep(50);\nExitApp.exitApp();\n};\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "native/navigation/persistance.js",
"diff": "+// @flow\n+\n+const navStateAsyncStorageKey = 'navState';\n+\n+export { navStateAsyncStorageKey };\n"
},
{
"change_type": "MODIFY",
"old_path": "native/root.react.js",
"new_path": "native/root.react.js",
"diff": "@@ -45,13 +45,13 @@ import './themes/fonts';\nimport LifecycleHandler from './lifecycle/lifecycle-handler.react';\nimport { DarkTheme, LightTheme } from './themes/navigation';\nimport { validNavState } from './navigation/navigation-utils';\n+import { navStateAsyncStorageKey } from './navigation/persistance';\nif (Platform.OS === 'android') {\nUIManager.setLayoutAnimationEnabledExperimental &&\nUIManager.setLayoutAnimationEnabledExperimental(true);\n}\n-const navStateAsyncStorageKey = 'navState';\nconst navInitAction = Object.freeze({ type: 'NAV/@@INIT' });\nconst navUnknownAction = Object.freeze({ type: 'NAV/@@UNKNOWN' });\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] Clear navigation state when purging Redux |
129,187 | 29.05.2020 00:22:07 | 14,400 | 38ee0b8026bf6ca0d13026c84f7cfb0705f8114c | [native] codeVersion -> 50 | [
{
"change_type": "MODIFY",
"old_path": "native/android/app/build.gradle",
"new_path": "native/android/app/build.gradle",
"diff": "@@ -132,8 +132,8 @@ android {\napplicationId \"org.squadcal\"\nminSdkVersion rootProject.ext.minSdkVersion\ntargetSdkVersion rootProject.ext.targetSdkVersion\n- versionCode 49\n- versionName \"0.0.49\"\n+ versionCode 50\n+ versionName \"0.0.50\"\nmissingDimensionStrategy 'react-native-camera', 'general'\nmultiDexEnabled true\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "native/ios/SquadCal/Info.debug.plist",
"new_path": "native/ios/SquadCal/Info.debug.plist",
"diff": "<key>CFBundlePackageType</key>\n<string>APPL</string>\n<key>CFBundleShortVersionString</key>\n- <string>0.0.49</string>\n+ <string>0.0.50</string>\n<key>CFBundleSignature</key>\n<string>????</string>\n<key>CFBundleVersion</key>\n- <string>49</string>\n+ <string>50</string>\n<key>LSApplicationQueriesSchemes</key>\n<array>\n<string>org-appextension-feature-password-management</string>\n"
},
{
"change_type": "MODIFY",
"old_path": "native/ios/SquadCal/Info.release.plist",
"new_path": "native/ios/SquadCal/Info.release.plist",
"diff": "<key>CFBundlePackageType</key>\n<string>APPL</string>\n<key>CFBundleShortVersionString</key>\n- <string>0.0.49</string>\n+ <string>0.0.50</string>\n<key>CFBundleSignature</key>\n<string>????</string>\n<key>CFBundleVersion</key>\n- <string>49</string>\n+ <string>50</string>\n<key>LSApplicationQueriesSchemes</key>\n<array>\n<string>org-appextension-feature-password-management</string>\n"
},
{
"change_type": "MODIFY",
"old_path": "native/redux/persist.js",
"new_path": "native/redux/persist.js",
"diff": "@@ -178,7 +178,7 @@ const persistConfig = {\ntimeout: __DEV__ ? 0 : undefined,\n};\n-const codeVersion = 49;\n+const codeVersion = 50;\n// This local exists to avoid a circular dependency where redux-setup needs to\n// import all the navigation and screen stuff, but some of those screens want to\n"
}
] | JavaScript | BSD 3-Clause New or Revised License | comme2e/comm | [native] codeVersion -> 50 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.