Rte fix focus removes new lines at the end (#535)

* RTE fix focusing removes new lines; * Fix bad dropdown logic on android; * Extended RTE vite config;
homebase-id · Jan 21, 2025 · 3226fdc · 3226fdc
1 parent 10c2159
commit 3226fdc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
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
@@ -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;

diff --git 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
@@ -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,

diff --git 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'),
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,9 +67,6 @@ @@
     }
     @layer base {
-      * {
-        @apply border-border;
-      }
       body {
         @apply bg-background text-foreground;
       }
@@ Expand Down @@