Skip to content

Commit 99bf99c

Browse files
committed
feat(json-crdt-peritext-ui): 🎸 add ability to navigate back on slice edit
1 parent bec4382 commit 99bf99c

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

‎src/json-crdt-peritext-ui/components/ContextPaneHeader.tsx‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import * as React from 'react';
22
import {ContextHeader} from './ContextHeader';
3+
import {Space} from 'nice-ui/lib/3-list-item/Space';
34
import {BasicButtonBack} from 'nice-ui/lib/2-inline-block/BasicButton/BasicButtonBack';
45
import {BasicButtonClose} from 'nice-ui/lib/2-inline-block/BasicButton/BasicButtonClose';
56
import {Flex} from 'nice-ui/lib/3-list-item/Flex';
@@ -15,7 +16,13 @@ export interface ContextPaneHeaderProps {
1516
export const ContextPaneHeader: React.FC<ContextPaneHeaderProps> = ({short, children, onBackClick, onCloseClick}) => {
1617
let element = (
1718
<Flex style={{alignItems: 'center'}}>
18-
{!!onBackClick && <BasicButtonBack onClick={onBackClick} />}
19+
{!!onBackClick && (
20+
<>
21+
<BasicButtonBack onClick={onBackClick} />
22+
<Space horizontal />
23+
{/* <Space horizontal size={-1} /> */}
24+
</>
25+
)}
1926
{children}
2027
</Flex>
2128
);

‎src/json-crdt-peritext-ui/plugins/toolbar/cursor/caret/CaretBottomOverlay/FormattingDisplay.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export const FormattingDisplay: React.FC<FormattingDisplayProps> = ({formatting,
1515

1616
return (
1717
<ContextPane style={{minWidth: 'calc(max(220px, min(360px, 80vw)))'}}>
18-
<ContextPaneHeader short onCloseClick={onClose}>
18+
<ContextPaneHeader short onBackClick={onClose}>
1919
<FormattingTitle formatting={formatting} />
2020
</ContextPaneHeader>
2121
<ContextPaneHeaderSep />

‎src/json-crdt-peritext-ui/plugins/toolbar/cursor/caret/CaretBottomOverlay/index.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ export const CaretBottomOverlay: React.FC<CaretBottomOverlayProps> = (props) =>
1919
const selected = useBehaviorSubject(state.selected$);
2020

2121
if (selected) {
22-
return (<FormattingDisplay formatting={selected} />);
22+
return (<FormattingDisplay formatting={selected} onClose={() => state.select(null)} />);
2323
}
2424

25-
return <FormattingList formattings={formattings} onSelect={state.onSelect} />;
25+
return <FormattingList formattings={formattings} onSelect={state.select} />;
2626
};

‎src/json-crdt-peritext-ui/plugins/toolbar/cursor/caret/CaretBottomOverlay/state.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class CaretBottomState {
2828
return res;
2929
};
3030

31-
public readonly onSelect = (formatting: SliceFormatting) => {
31+
public readonly select = (formatting: SliceFormatting | null) => {
3232
this.selected$.next(formatting);
3333
};
3434
}

0 commit comments

Comments
 (0)