Skip to content

Commit 612b64b

Browse files
committed
feat(json-crdt-peritext-ui): 🎸 remove new formatting state class
1 parent 135b5cc commit 612b64b

File tree

5 files changed

+7
-29
lines changed

5 files changed

+7
-29
lines changed

src/json-crdt-peritext-ui/plugins/toolbar/config/NewLinkConfig.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,10 @@ const iconClass = rule({
5050
},
5151
});
5252

53-
export const NewLinkConfig: React.FC<NewProps> = ({state}) => {
53+
export const NewLinkConfig: React.FC<NewProps> = ({formatting}) => {
5454
const styles = useStyles();
5555
const {toolbar} = useToolbarPlugin();
5656
const inpRef = React.useRef<HTMLInputElement | null>(null);
57-
const {formatting} = state;
5857
const api = formatting.conf();
5958
const href = React.useMemo(() => () => formatting.conf()?.str(['href']), [formatting]);
6059
const hrefView = useSyncStoreOpt(href()?.events) || '';
@@ -67,7 +66,7 @@ export const NewLinkConfig: React.FC<NewProps> = ({state}) => {
6766
return (
6867
<form className={blockClass} onSubmit={(e) => {
6968
e.preventDefault();
70-
state.save();
69+
formatting.save();
7170
}}>
7271
<ContextPaneHeader short onCloseClick={() => toolbar.newSlice.next(void 0)}>
7372
<FormattingTitle formatting={formatting} />
@@ -87,7 +86,7 @@ export const NewLinkConfig: React.FC<NewProps> = ({state}) => {
8786
onKeyDown={(e) => {
8887
if (e.key === 'Enter') {
8988
e.preventDefault();
90-
state.save();
89+
formatting.save();
9190
}
9291
}}
9392
right={(

src/json-crdt-peritext-ui/plugins/toolbar/formatting/new/FormattingNew.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react';
22
import type {NewProps} from '../../types';
33

44
export const FormattingNew: React.FC<NewProps> = (props) => {
5-
const New = props.state.formatting.behavior.data().New;
5+
const New = props.formatting.behavior.data().New;
66

77
return (
88
New ? <New {...props} /> : <div>new renderer not provided</div>

src/json-crdt-peritext-ui/plugins/toolbar/formatting/new/FormattingNewCard.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import * as React from 'react';
22
import {ContextPane} from 'nice-ui/lib/4-card/ContextMenu/ContextPane';
33
import {useToolbarPlugin} from '../../context';
44
import {FormattingNew} from './FormattingNew';
5-
import {FormattingNewState} from './FormattingNewState';
65
import type {NewFormatting} from '../../state/formattings';
76

87
export interface FormattingNewCardProps {
@@ -11,7 +10,6 @@ export interface FormattingNewCardProps {
1110

1211
export const FormattingNewCard: React.FC<FormattingNewCardProps> = ({formatting}) => {
1312
const {toolbar} = useToolbarPlugin();
14-
const state = React.useMemo(() => new FormattingNewState(formatting), [formatting]);
1513

1614
return (
1715
<div onKeyDown={(e) => {
@@ -22,7 +20,7 @@ export const FormattingNewCard: React.FC<FormattingNewCardProps> = ({formatting}
2220
}
2321
}}>
2422
<ContextPane style={{display: 'block', minWidth: 'calc(min(600px, max(50vw, 260px)))'}}>
25-
<FormattingNew state={state} />
23+
<FormattingNew formatting={formatting} />
2624
</ContextPane>
2725
</div>
2826
);

src/json-crdt-peritext-ui/plugins/toolbar/formatting/new/FormattingNewState.ts

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/json-crdt-peritext-ui/plugins/toolbar/types.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import type {SliceBehavior} from '../../../json-crdt-extensions/peritext/registr
44
import type {SliceStacking} from '../../../json-crdt-extensions/peritext/slice/constants';
55
import type {TypeTag} from '../../../json-crdt-extensions';
66
import type {NodeBuilder} from '../../../json-crdt-patch';
7-
import type {SliceFormatting, ToolbarFormatting} from './state/formattings';
8-
import type {FormattingNewState} from './formatting/new/FormattingNewState';
7+
import type {NewFormatting, SliceFormatting, ToolbarFormatting} from './state/formattings';
98

109
export type {MenuItem};
1110

@@ -55,7 +54,7 @@ export interface SliceRegistryEntryData extends Record<string, unknown> {
5554
}
5655

5756
export interface NewProps {
58-
state: FormattingNewState;
57+
formatting: NewFormatting;
5958
}
6059

6160
/**

0 commit comments

Comments
 (0)