Skip to content

Fix note editor behaviors #452

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.

Sign up for GitHub

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

Merged
thesophiaxu merged 2 commits into from
Apr 20, 2022
Merged

Fix note editor behaviors #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7131fe6
fix(notes): consider collapsed state when splitting child
dragonman225 Apr 19, 2022
f7f2bda
fix(notes): don't show collapsed bullet when there're no children
dragonman225 Apr 19, 2022
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
2 changes: 1 addition & 1 deletion packages/unigraph-dev-explorer/src/examples/notes/Outline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ export function Outline({
cx="12"
cy="12"
r="10"
style={{ fill: isCollapsed ? colors.grey[200] : 'transparent' }}
style={{ fill: showCollapse && isCollapsed ? colors.grey[200] : 'transparent' }}
/>
<circle cx="12" cy="12" r="4" style={{ fill: 'black' }} />
</svg>
Expand Down
57 changes: 37 additions & 20 deletions packages/unigraph-dev-explorer/src/examples/notes/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { parseTodoObject } from '../todo/parseTodoObject';
import { NoteEditorContext } from './types';
import { getParentsAndReferences } from '../../components/ObjectView/backlinksUtils';
import { addCommand, CommandState, getChildrenStubMap, getCurrentFocus } from './history';
import { isNoteBlockCollapsed } from './useOutlineCollapsed';

export const focusUid = (obj: any, goingUp?: boolean, caret?: number) => {
// console.log(document.getElementById(`object-view-${uid}`)?.children[0]?.children[0]?.children[0]?.children[0]?.children[0]?.children[0]);
Expand Down Expand Up @@ -77,6 +78,7 @@ export const addChildren = (
focusCaret: -1,
},
]);
console.log((window.unigraph as any).getSchemaMap());
window.unigraph.updateObject(
data._value.uid,
{
Expand Down Expand Up @@ -174,29 +176,44 @@ export const addChildren = (
window.unigraph.touch(parents.map((el) => el.uid));
};

export const splitChild = (data: any, context: NoteEditorContext, index: number, oldtext: string, at: number) => {
// console.log(JSON.stringify([data, index, at], null, 4))
console.log(getSubentities(data).sort(byElementIndex)[index]?._value?._value);
if (
oldtext.slice(at) === '' &&
!getSubentities(getSubentities(data).sort(byElementIndex)[index]?._value?._value).length
) {
addChild(data, context, index, oldtext);
/**
* @param parent The parent note block of the note block to split.
* @param context
* @param index Index of the note block to split among its siblings.
* @param oldText The text of the note block to split.
* @param at The position in `oldText` where splitting should take place.
*/
export const splitChild = (parent: any, context: NoteEditorContext, index: number, oldText: string, at: number) => {
const noteBlockToSplit = getSubentities(parent).sort(byElementIndex)[index]?._value?._value;

function hasChildren(noteBlock: any) {
return getSubentities(noteBlock).length;
}

/** Split a note block that has children and is collapsed. TODO: Undo command. */
if (hasChildren(noteBlockToSplit) && isNoteBlockCollapsed(noteBlockToSplit.uid)) {
addChildren(parent, context, index, [oldText.slice(at)], oldText.slice(0, at));
return;
}
const parents = getParents(data);
if (!data._hide) parents.push({ uid: data.uid });

if (oldText.slice(at) === '' && !hasChildren(noteBlockToSplit)) {
addChild(parent, context, index, oldText);
return;
}

const parents = getParents(parent);
if (!parent._hide) parents.push({ uid: parent.uid });
let currSubentity = -1;
let isInserted = false;
removeAllPropsFromObj(data, ['~_value', '~unigraph.origin', 'unigraph.origin']);
removeAllPropsFromObj(parent, ['~_value', '~unigraph.origin', 'unigraph.origin']);
let toDelete: any = [];
const undoCommand: CommandState = [];
const children = getSemanticChildren(data)?.['_value['].sort(byElementIndex);
const children = getSemanticChildren(parent)?.['_value['].sort(byElementIndex);
const newChildren = children?.reduce((prev: any[], el: any, elindex: any) => {
if (el?._value?.type?.['unigraph.id'] === '$/schema/subentity' && ++currSubentity === index) {
isInserted = true;
/* */
const prevText = oldtext.slice(0, at);
const prevText = oldText.slice(0, at);
const splittedEntity = buildUnigraphEntity(
{
text: {
Expand Down Expand Up @@ -225,12 +242,12 @@ export const splitChild = (data: any, context: NoteEditorContext, index: number,
el._value._hide = true;
el._value._value._hide = true;
const loc = el._value._value._value.text || el._value._value._value.name;
loc._value._value['_value.%'] = oldtext.slice(at);
loc._value._value['_value.%'] = oldText.slice(at);
undoCommand.push({
type: 'textual',
subsId: context.callbacks.subsId,
uid: loc._value._value.uid,
oldText: oldtext,
oldText,
...getCurrentFocus(),
});
// distribute references accordingly
Expand Down Expand Up @@ -288,14 +305,14 @@ export const splitChild = (data: any, context: NoteEditorContext, index: number,
undoCommand.push({
type: 'children',
subsId: context.callbacks.subsId,
uid: data._value.uid,
oldChildrenUid: data._value?.children?.uid,
oldData: getChildrenStubMap(data._value?.children),
uid: parent._value.uid,
oldChildrenUid: parent._value?.children?.uid,
oldData: getChildrenStubMap(parent._value?.children),
});
addCommand(context.historyState.value, undoCommand);
window.unigraph.updateObject(
data?._value?.uid,
{ children: { _displayAs: data?._value?.children?._displayAs, '_value[': newChildren } },
parent?._value?.uid,
{ children: { _displayAs: parent?._value?.children?._displayAs, '_value[': newChildren } },
false,
false,
context.callbacks.subsId,
Expand Down
4 changes: 4 additions & 0 deletions packages/unigraph-dev-explorer/src/examples/notes/useOutlineCollapsed.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,7 @@ export function useOutlineCollapsed(noteBlockUid: string): [boolean, () => void]
);
return [isCollapsed, toggleCollapsed];
}

export function isNoteBlockCollapsed(noteBlockUid: string): boolean {
return useOutlineCollapsedMap.getState().collapsedMap[noteBlockUid];
}