Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Emplty state issue #49

Merged
merged 5 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.2.8",
"version": "0.2.9",
"license": "MIT",
"main": "dist/index.js",
"typings": "dist/index.d.ts",
Expand Down Expand Up @@ -95,4 +95,4 @@
"\\.(css|less|scss|sass)$": "identity-obj-proxy"
}
}
}
}
136 changes: 80 additions & 56 deletions src/components/RaraEditor/RaraEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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('');
Expand All @@ -99,7 +100,8 @@ const RaraEditor = (props: RaraEditorProps) => {
),
[]
);



const {
onDOMBeforeInput,
onKeyDown,
Expand Down Expand Up @@ -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) {
Expand All @@ -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
Expand Down Expand Up @@ -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 =>
Expand All @@ -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) => [
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/components/RaraEditor/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
padding: 12px;
border-radius: 4px;
width: auto;
min-height: 60px;
min-height: auto;
}

.rte-editor.read-only {
Expand Down
45 changes: 28 additions & 17 deletions src/components/Toolbar/Toolbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -84,9 +94,10 @@ export const Toolbar = () => {
}
}}
/>
<Divider />
<Divider />
</>}
{/* <Search onChange={onSearch} /> */}
</div>
</ContextProvider>
</ContextProvider >
);
};
Loading
Loading