From 1acea0874920189849f76feab6502f0560aae639 Mon Sep 17 00:00:00 2001 From: Stef Coenen Date: Tue, 21 Jan 2025 15:28:42 +0100 Subject: [PATCH 1/3] RTE fix focusing removes new lines; --- .../src/components/Community/Message/composer/DraftSaver.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/apps/community-app/src/components/Community/Message/composer/DraftSaver.tsx b/packages/apps/community-app/src/components/Community/Message/composer/DraftSaver.tsx index 4049a3f8d..d8dc8b25e 100644 --- a/packages/apps/community-app/src/components/Community/Message/composer/DraftSaver.tsx +++ b/packages/apps/community-app/src/components/Community/Message/composer/DraftSaver.tsx @@ -46,7 +46,9 @@ export const DraftSaver = ({ if (metadata && draftKey && updatedAt) { if ( - getPlainTextFromRichText(drafts[draftKey]?.message) === getPlainTextFromRichText(message) || + (drafts[draftKey]?.message?.length === message?.length && + getPlainTextFromRichText(drafts[draftKey]?.message) === + getPlainTextFromRichText(message)) || (drafts[draftKey] && drafts[draftKey]?.updatedAt >= updatedAt) ) return; From 74c92de10e9d6e64964b9b13a8eb9b764b94b6de Mon Sep 17 00:00:00 2001 From: Stef Coenen Date: Tue, 21 Jan 2025 15:43:43 +0100 Subject: [PATCH 2/3] Fix bad dropdown logic on android; --- packages/common/rich-text-editor/src/app/App.css | 3 --- .../src/components/plate-ui/inline-combobox.tsx | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/common/rich-text-editor/src/app/App.css b/packages/common/rich-text-editor/src/app/App.css index 64d71c66d..b30ed9bbc 100644 --- a/packages/common/rich-text-editor/src/app/App.css +++ b/packages/common/rich-text-editor/src/app/App.css @@ -67,9 +67,6 @@ } @layer base { - * { - @apply border-border; - } body { @apply bg-background text-foreground; } diff --git a/packages/common/rich-text-editor/src/components/plate-ui/inline-combobox.tsx b/packages/common/rich-text-editor/src/components/plate-ui/inline-combobox.tsx index b1b849c06..1c1fa7258 100644 --- a/packages/common/rich-text-editor/src/components/plate-ui/inline-combobox.tsx +++ b/packages/common/rich-text-editor/src/components/plate-ui/inline-combobox.tsx @@ -41,6 +41,7 @@ import { } from '@udecode/plate-common'; import { findNodePath, useComposedRef, useEditorRef } from '@udecode/plate-common/react'; import { cva } from 'class-variance-authority'; +import { isTouchDevice } from '@homebase-id/js-lib/helpers'; type FilterFn = (item: { value: string; keywords?: string[] }, search: string) => boolean; @@ -125,8 +126,9 @@ const InlineCombobox = ({ }; }, [editor, element]); + const isTouch = useMemo(() => isTouchDevice(), []); const { props: inputProps, removeInput } = useComboboxInput({ - cancelInputOnBlur: true, + cancelInputOnBlur: !isTouch, cancelInputOnEscape: true, cancelInputOnBackspace: true, cursorState, From f423f67cfbbb46c3adfb06cfb6a0da5899c40977 Mon Sep 17 00:00:00 2001 From: Stef Coenen Date: Tue, 21 Jan 2025 15:44:35 +0100 Subject: [PATCH 3/3] Extended RTE vite config; --- packages/common/rich-text-editor/vite.config.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/common/rich-text-editor/vite.config.ts b/packages/common/rich-text-editor/vite.config.ts index a91ebc876..ee048d0d7 100644 --- a/packages/common/rich-text-editor/vite.config.ts +++ b/packages/common/rich-text-editor/vite.config.ts @@ -12,6 +12,7 @@ const hostConfig = { export default defineConfig({ plugins: [react()], server: { + // host: true, ...hostConfig, https: { key: fs.readFileSync('../../../dev-dotyou-cloud.key'),