diff --git a/package.json b/package.json index 62db655ff7..066c7c7616 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "@fortawesome/react-native-fontawesome": "^0.3.2", "@haileyok/bluesky-video": "0.1.10", "@lingui/react": "^4.5.0", - "@mattermost/react-native-paste-input": "^0.8.0", + "@haileyok/react-native-paste-input": "^0.8.1-rc.3", "@miblanchard/react-native-slider": "^2.3.1", "@radix-ui/react-dropdown-menu": "^2.0.6", "@react-native-async-storage/async-storage": "1.23.1", @@ -192,7 +192,7 @@ "react-native-safe-area-context": "^4.11.0", "react-native-screens": "~3.34.0", "react-native-svg": "^15.6.0", - "react-native-uitextview": "^2.0.0-rc.0", + "react-native-uitextview": "2.0.0-rc.0", "react-native-url-polyfill": "^1.3.0", "react-native-uuid": "^2.0.2", "react-native-view-shot": "^4.0.0-alpha.3", diff --git a/patches/@mattermost+react-native-paste-input+0.7.1.patch b/patches/@mattermost+react-native-paste-input+0.7.1.patch.disabled similarity index 100% rename from patches/@mattermost+react-native-paste-input+0.7.1.patch rename to patches/@mattermost+react-native-paste-input+0.7.1.patch.disabled diff --git a/src/view/com/composer/text-input/TextInput.tsx b/src/view/com/composer/text-input/TextInput.tsx index 778439259e..0d288df15e 100644 --- a/src/view/com/composer/text-input/TextInput.tsx +++ b/src/view/com/composer/text-input/TextInput.tsx @@ -17,21 +17,21 @@ import {AppBskyRichtextFacet, RichText} from '@atproto/api' import PasteInput, { PastedFile, PasteInputRef, -} from '@mattermost/react-native-paste-input' +} from '@haileyok/react-native-paste-input' +import {POST_IMG_MAX} from '#/lib/constants' +import {usePalette} from '#/lib/hooks/usePalette' +import {downloadAndResize} from '#/lib/media/manip' +import {isUriImage} from '#/lib/media/util' +import {cleanError} from '#/lib/strings/errors' +import {getMentionAt, insertMentionAt} from '#/lib/strings/mention-manip' +import {useTheme} from '#/lib/ThemeContext' import {isAndroid} from '#/platform/detection' -import {POST_IMG_MAX} from 'lib/constants' -import {usePalette} from 'lib/hooks/usePalette' -import {downloadAndResize} from 'lib/media/manip' -import {isUriImage} from 'lib/media/util' -import {cleanError} from 'lib/strings/errors' -import {getMentionAt, insertMentionAt} from 'lib/strings/mention-manip' -import {useTheme} from 'lib/ThemeContext' import { LinkFacetMatch, suggestLinkCardUri, -} from 'view/com/composer/text-input/text-input-util' -import {Text} from 'view/com/util/text/Text' +} from '#/view/com/composer/text-input/text-input-util' +import {Text} from '#/view/com/util/text/Text' import {atoms as a, useAlf} from '#/alf' import {normalizeTextStyles} from '#/components/Typography' import {Autocomplete} from './mobile/Autocomplete' diff --git a/yarn.lock b/yarn.lock index be699afc2e..c47b3f5641 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4294,6 +4294,13 @@ resolved "https://registry.yarnpkg.com/@haileyok/bluesky-video/-/bluesky-video-0.1.10.tgz#2756e8c83a78caeb6b120a175578eac1eb6889a9" integrity sha512-W8+DNdek+xjAqTO1zmuuSrkVFxDepcP8+Gs8MvIcYSgXEJlpQimZpcMwAduiDI/jZMn/2U6cnMahx7YuiZlZ7g== +"@haileyok/react-native-paste-input@^0.8.1-rc.3": + version "0.8.1-rc.3" + resolved "https://registry.yarnpkg.com/@haileyok/react-native-paste-input/-/react-native-paste-input-0.8.1-rc.3.tgz#59f87e829a56416703a8f9e2dc0cc9746b9d4315" + integrity sha512-u2vieFxDbpnC4I0Qdt1MGcS8+k8aG9LzwkLS5Z1td4bRz0SoHXiB0EkF8eItRyzHgBF8HckC1eiKfPHxbgqQ4g== + dependencies: + semver "7.6.0" + "@hapi/accept@^6.0.3": version "6.0.3" resolved "https://registry.yarnpkg.com/@hapi/accept/-/accept-6.0.3.tgz#eef0800a4f89cd969da8e5d0311dc877c37279ab" @@ -5102,13 +5109,6 @@ dependencies: "@lukeed/csprng" "^1.1.0" -"@mattermost/react-native-paste-input@^0.8.0": - version "0.8.0" - resolved "https://registry.yarnpkg.com/@mattermost/react-native-paste-input/-/react-native-paste-input-0.8.0.tgz#c5fb334b4bf5b43785292955a593af135e5b9de7" - integrity sha512-Tn+9gmq/Z+xr+sUlbnggUFBDYadSvDJotFgILQaXYjjff0huxnDrfGLPYGS07iXW8fokgPVaLEtsyuf1YxrC6w== - dependencies: - semver "7.6.0" - "@messageformat/parser@^5.0.0": version "5.1.0" resolved "https://registry.yarnpkg.com/@messageformat/parser/-/parser-5.1.0.tgz#05e4851c782d633ad735791dd0a68ee65d2a7201" @@ -19394,7 +19394,7 @@ react-native-svg@^15.6.0: css-tree "^1.1.3" warn-once "0.1.1" -react-native-uitextview@^2.0.0-rc.0: +react-native-uitextview@2.0.0-rc.0: version "2.0.0-rc.0" resolved "https://registry.yarnpkg.com/react-native-uitextview/-/react-native-uitextview-2.0.0-rc.0.tgz#fd69b7a56a1b9b9d5b3c687b11bee79f5d3e96c2" integrity sha512-8Mt9rc/V5LEwnOvSPGvXwI68Zqzlp/wzR7ocZDNzIciFVs2WQFj7tDBHOaUeSk/7n98AqgfvhhoQX/PzfL5SYQ==