Merge pull request #51 from raralabs/dev

Release version v0.2.9
raralabs · Nov 2, 2023 · f8ebc50 · f8ebc50
2 parents cd00536 + 228cc84
commit f8ebc50
Show file tree

Hide file tree

Showing 5 changed files with 165 additions and 114 deletions.
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.2.8",
+  "version": "0.2.9",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -95,4 +95,4 @@
       "\\.(css|less|scss|sass)$": "identity-obj-proxy"
     }
   }
-}
+}
diff --git a/src/components/RaraEditor/RaraEditor.tsx b/src/components/RaraEditor/RaraEditor.tsx
@@ -74,13 +74,14 @@ const RaraEditor = (props: RaraEditorProps) => {
     mentionDetailRenderer,
     styles,
     value,
-    autoFocus=false,
-
+    autoFocus = false,
+    toolbarIgnorList,
+      hideOnBlur = false
   } = props;
 
-
-  const ref = React.useRef<HTMLInputElement>(null);
 
+  const ref = React.useRef<HTMLInputElement>(null);
+  const [blur, setBlur] = React.useState(!autoFocus)
   const [target, setTarget] = React.useState<Range | null>();
   const [index, setIndex] = React.useState(0);
   const [search] = React.useState('');
@@ -99,7 +100,8 @@ const RaraEditor = (props: RaraEditorProps) => {
       ),
     []
   );
-
+
+
   const {
     onDOMBeforeInput,
     onKeyDown,
@@ -146,9 +148,16 @@ const RaraEditor = (props: RaraEditorProps) => {
     ]
   );
   const renderLeaf = React.useCallback(
-    (props: RenderLeafProps) => <Leaf {...props} editor={editor}/>,
+    (props: RenderLeafProps) => <Leaf {...props} editor={editor} />,
     []
   );
+  React.useEffect(() => {
+    if(!autoFocus && !hideOnBlur){
+
+    setBlur(false)
+    }
+
+  },[autoFocus])
 
   React.useEffect(() => {
     if (target && searchResults.length > 0) {
@@ -169,9 +178,10 @@ const RaraEditor = (props: RaraEditorProps) => {
       style={styles}
     >
       <Slate
+
         key={JSON.stringify(finalData)}
         onChange={async change => {
-          
+
           //TO check if the values are changed or not
           const isAstChange = editor.operations.some(
             op => 'set_selection' !== op.type
@@ -234,27 +244,28 @@ const RaraEditor = (props: RaraEditorProps) => {
               return;
             }
           }
+
           setTarget(null);
           if (isAstChange) {
             // Save the value to Local Storage.
             setFinalData(change as unknown as string);
-            if(JSON.stringify(change) === '[{"type":"paragraph","children":[{"text":""}]}]')
-            {     onChange && onChange('');
-          } else {
+            if (JSON.stringify(change) === '[{"type":"paragraph","children":[{"text":""}]}]') {
+              onChange && onChange('');
+            } else {
               onChange && onChange(JSON.stringify(change));
             }
             //managing mention  data
 
             const edtr = editor.operations;
-            
+
             const mentionUser = edtr.find(
               (e: BaseOperation): e is BaseInsertNodeOperation =>
                 e.type === 'insert_node' && e?.node?.type === 'mention'
             );
 
             const removeMentionUser = edtr.filter(
               (e: BaseOperation): e is RemoveNodeOperation =>
-                e.type === 'remove_node' && (e?.node?.type === 'mention' ||(e?.node?.type === 'mention' && e?.node?.text === "")),
+                e.type === 'remove_node' && (e?.node?.type === 'mention' || (e?.node?.type === 'mention' && e?.node?.text === "")),
             );
             const mentionContact = edtr.find(
               (e: BaseOperation): e is BaseInsertNodeOperation =>
@@ -272,32 +283,31 @@ const RaraEditor = (props: RaraEditorProps) => {
               // console.log({editor,edtr});
               let last
               let newLast
-              const setSelection = edtr.filter((e:BaseOperation):e is SelectionOperation => e.type === 'set_selection')
-
-              for(let i=0; i<removeMentionUser.length ; i++)
-              {
+              const setSelection = edtr.filter((e: BaseOperation): e is SelectionOperation => e.type === 'set_selection')
+
+              for (let i = 0; i < removeMentionUser.length; i++) {
                 setMentionUsers((pre: string[]) => [
                   ...removeById(pre, removeMentionUser[i].node.id!),
                 ]);
               }
-             
-              last =  removeMentionUser[0].path[removeMentionUser[0].path.length -1] - 1  ,
-              newLast = [...removeMentionUser[0].path],
-             newLast[removeMentionUser[0].path.length - 1] = last,
-              Transforms.select(editor, {
-                anchor: Editor.end(editor, {
-                  path: setSelection ? setSelection[0]?.newProperties?.anchor ?setSelection[0]?.newProperties?.anchor.path :setSelection[0]?.newProperties?.focus?.path! : [...newLast],
-                  offset: edtr[0].type === "remove_text" ? edtr[0].offset : 0
-                }),
-            
-                focus: Editor.end(editor, {
-                  path: setSelection ? setSelection[0]?.newProperties?.anchor ?setSelection[0]?.newProperties?.anchor.path :setSelection[0]?.newProperties?.focus?.path! : [...newLast],
-
-
-                  offset: edtr[0].type === "remove_text" ? edtr[0].offset : 0
-                })
-              });
-              
+
+              last = removeMentionUser[0].path[removeMentionUser[0].path.length - 1] - 1,
+                newLast = [...removeMentionUser[0].path],
+                newLast[removeMentionUser[0].path.length - 1] = last,
+                Transforms.select(editor, {
+                  anchor: Editor.end(editor, {
+                    path: setSelection ? setSelection[0]?.newProperties?.anchor ? setSelection[0]?.newProperties?.anchor.path : setSelection[0]?.newProperties?.focus?.path! : [...newLast],
+                    offset: edtr[0].type === "remove_text" ? edtr[0].offset : 0
+                  }),
+
+                  focus: Editor.end(editor, {
+                    path: setSelection ? setSelection[0]?.newProperties?.anchor ? setSelection[0]?.newProperties?.anchor.path : setSelection[0]?.newProperties?.focus?.path! : [...newLast],
+
+
+                    offset: edtr[0].type === "remove_text" ? edtr[0].offset : 0
+                  })
+                });
+
             }
             if (mentionContact) {
               setMentionContacts((pre: any) => [
@@ -307,46 +317,60 @@ const RaraEditor = (props: RaraEditorProps) => {
             }
 
             if (removeMentionContact.length > 0) {
-              
+
               let last
               let newLast
-              for(let i=0; i<removeMentionContact.length ; i++){
-                
+              for (let i = 0; i < removeMentionContact.length; i++) {
+
                 setMentionContacts((pre: string[]) => [
                   ...removeById(pre, removeMentionContact[i].node.id!),
-           
+
                 ]);
               }
-              last =  removeMentionContact[0].path[removeMentionContact[0].path.length -1] - 1,
-              newLast = [...removeMentionContact[0].path],
-             newLast[removeMentionContact[0].path.length - 1] = last,
-              Transforms.select(editor, {
-                anchor: Editor.end(editor, {
-                  path: [...newLast],
-                  offset: edtr[0].type === "remove_text" ? edtr[0].offset : 0
-
-                }),
-            
-                focus: Editor.end(editor, {
-                  path: [...newLast],
-                  offset: edtr[0].type === "remove_text" ? edtr[0].offset : 0
-
-                })
-              });
+              last = removeMentionContact[0].path[removeMentionContact[0].path.length - 1] - 1,
+                newLast = [...removeMentionContact[0].path],
+                newLast[removeMentionContact[0].path.length - 1] = last,
+                Transforms.select(editor, {
+                  anchor: Editor.end(editor, {
+                    path: [...newLast],
+                    offset: edtr[0].type === "remove_text" ? edtr[0].offset : 0
+
+                  }),
+
+                  focus: Editor.end(editor, {
+                    path: [...newLast],
+                    offset: edtr[0].type === "remove_text" ? edtr[0].offset : 0
+
+                  })
+                });
             }
           }
         }}
         editor={editor}
         value={finalData as Descendant[]}
       >
-        {!readOnly && (
+        {(!readOnly && !toolbarIgnorList?.includes('all') && !blur ) && (
           <div style={{ marginBottom: '16px' }}>
-            <Toolbar />
+            <Toolbar ignorList={toolbarIgnorList} />
           </div>
         )}
         <Editable
           decorate={decorate}
           spellCheck
+          onFocus={() => {
+          if(hideOnBlur) {
+
+            setBlur(false)
+          }
+          }}
+          onBlur={() => {
+            if(hideOnBlur)
+            {
+
+            setBlur(true)
+            }
+
+          }}
           autoFocus={autoFocus}
           renderElement={(p: RenderElementProps) => {
             return renderElement(p);

diff --git a/src/components/RaraEditor/styles.css b/src/components/RaraEditor/styles.css
@@ -8,7 +8,7 @@
   padding: 12px;
   border-radius: 4px;
   width: auto;
-  min-height: 60px;
+  min-height: auto;
 }
 
 .rte-editor.read-only {

diff --git a/src/components/Toolbar/Toolbar.tsx b/src/components/Toolbar/Toolbar.tsx
@@ -15,22 +15,27 @@ import { Headings } from './Headings';
 import { ListsMarkers } from './Lists';
 import { MarkerItem, Markers } from './Markers';
 import { TextAlignMarkers } from './TextAlignMarkers';
+import { ElementIgnorType } from '../../types';
 
 // interface ToolbarProps {
 //   items: any[];
 //   onSearch?: (e: string) => void;
 // }
-export const Toolbar = () => {
+export const Toolbar = ({ ignorList }: { ignorList?: ElementIgnorType[] }) => {
   const editor = useSlate();
   // console.log(editor);
   return (
     <ContextProvider>
       <div className="rte-toolbar">
-        <ColorPicker />
-        <Divider />
+        {!ignorList?.includes('color') &&
+          <>
+            <ColorPicker />
+            <Divider />
+          </>}
+
         <Markers />
         <Divider />
-        <MarkerItem
+        {!ignorList?.includes('block-quote') && <><MarkerItem
           key={'block-quote'}
           icon={Icons.QUOTE}
           name="Block Quot"
@@ -40,13 +45,16 @@ export const Toolbar = () => {
           }}
           active={isBlockActive(editor, 'block-quote')}
         />
-        <Divider />
-        <Headings />
-        <Divider />
-        <TextAlignMarkers />
-        <ListsMarkers />
-        <Divider />
-        <MarkerItem
+          <Divider />
+        </>}
+        {!ignorList?.includes('heading') && <><Headings />
+          <Divider />
+        </>}
+        {!ignorList?.includes('alignMarker') && <TextAlignMarkers />}
+        {!ignorList?.includes('listMarker') && <><ListsMarkers />
+          <Divider />
+        </>}
+        {!ignorList?.includes('code') && <> <MarkerItem
           key={'code'}
           icon={Icons.CODE}
           name="Code"
@@ -56,8 +64,9 @@ export const Toolbar = () => {
             toggleBlock(editor, 'code');
           }}
         />
-        <Divider />
-        <MarkerItem
+          <Divider />
+        </>}
+        {!ignorList?.includes('check-list-item') && <><MarkerItem
           key={'check-list-item'}
           icon={Icons.CLIST}
           name="Checklist"
@@ -67,8 +76,9 @@ export const Toolbar = () => {
             toggleBlock(editor, 'check-list-item');
           }}
         />
-        <Divider />
-        <MarkerItem
+          <Divider />
+        </>}
+        {ignorList?.includes('link') && <> <MarkerItem
           icon={Icons.LINK}
           key="link"
           name="Link"
@@ -84,9 +94,10 @@ export const Toolbar = () => {
             }
           }}
         />
-        <Divider />
+          <Divider />
+        </>}
         {/* <Search onChange={onSearch} /> */}
       </div>
-    </ContextProvider>
+    </ContextProvider >
   );
 };