Skip to content
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
14 changes: 12 additions & 2 deletions src/lib/unstable/core/SchemaRendererNode/SchemaRendererNode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {SCHEMA_RENDERER_SERVICE_FIELD} from '../useSchemaRenderer';
import {useSchemaRendererState} from '../useSchemaRendererState';
import {getParentName, getServiceFieldName, getStrictModeChecker} from '../utils';

import {SchemaRendererNodeContext} from './context';
import {SchemaRendererNodeContext, createSchemaRendererNodeContextRuler} from './context';
import type {SchemaRendererNodeState} from './types';
import {coerceToJsonSchemaType, getAccumulatedSchema, getRenderKit, scheduleFlush} from './utils';

Expand Down Expand Up @@ -257,6 +257,16 @@ const SchemaRendererNodeComponent: React.FC<SchemaRendererNodeProps> = ({
[headName, input, meta, mode, name, parentValueEmpty, schema, schemaPath, settings],
);

const [nodeContextRuler] = React.useState(() =>
createSchemaRendererNodeContextRuler(nodeContext),
);

nodeContextRuler.set(nodeContext);

React.useEffect(() => {
nodeContextRuler.notify();
}, [nodeContext, nodeContextRuler]);

React.useEffect(() => {
const unsubscribe = form.subscribe(
(state) => {
Expand Down Expand Up @@ -350,7 +360,7 @@ const SchemaRendererNodeComponent: React.FC<SchemaRendererNodeProps> = ({

if (content) {
content = (
<SchemaRendererNodeContext.Provider value={nodeContext}>
<SchemaRendererNodeContext.Provider value={nodeContextRuler}>
{content}
</SchemaRendererNodeContext.Provider>
);
Expand Down
60 changes: 57 additions & 3 deletions src/lib/unstable/core/SchemaRendererNode/context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,62 @@ export interface SchemaRendererNodeContextValue extends FieldRenderProps<FieldVa
settings?: SchemaRendererSettings;
}

export const SchemaRendererNodeContext = React.createContext<SchemaRendererNodeContextValue>(
{} as unknown as SchemaRendererNodeContextValue,
export interface SchemaRendererNodeContextRuler {
getSnapshot: () => SchemaRendererNodeContextValue;
notify: () => void;
set: (value: SchemaRendererNodeContextValue) => void;
subscribe: (listener: () => void) => () => void;
}

export const createSchemaRendererNodeContextRuler = (
initialValue: SchemaRendererNodeContextValue,
): SchemaRendererNodeContextRuler => {
let value = initialValue;
const listeners = new Set<() => void>();

return {
getSnapshot: () => value,
notify: () => {
listeners.forEach((listener) => listener());
},
set: (nextValue) => {
value = nextValue;
},
subscribe: (listener) => {
listeners.add(listener);

return () => {
listeners.delete(listener);
};
},
};
};

export const SchemaRendererNodeContext = React.createContext<SchemaRendererNodeContextRuler>(
null as unknown as SchemaRendererNodeContextRuler,
);

export const useSchemaRendererNodeContext = () => React.useContext(SchemaRendererNodeContext);
export const useSchemaRendererNodeContext = (): SchemaRendererNodeContextValue => {
const store = React.useContext(SchemaRendererNodeContext);

const value = store.getSnapshot();
const [, forceRender] = React.useReducer((x: number) => x + 1, 0);
const valueRef = React.useRef(value);

valueRef.current = value;

React.useLayoutEffect(() => {
const check = () => {
if (store.getSnapshot() !== valueRef.current) {
forceRender();
}
};
const unsubscribe = store.subscribe(check);

check();

return unsubscribe;
}, [store]);

return value;
};
1 change: 1 addition & 0 deletions src/lib/unstable/core/SchemaRendererNode/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ export {SchemaRendererNode, type SchemaRendererNodeProps} from './SchemaRenderer
export {
SchemaRendererNodeContext,
type SchemaRendererNodeContextValue,
createSchemaRendererNodeContextRuler,
useSchemaRendererNodeContext,
} from './context';
export type {SchemaRendererNodeState} from './types';
Expand Down
1 change: 1 addition & 0 deletions src/lib/unstable/core/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export {
type SchemaRendererNodeProps,
type SchemaRendererNodeState,
getRenderKit,
createSchemaRendererNodeContextRuler,
useSchemaRendererNodeContext,
} from './SchemaRendererNode';
export {SchemaRenderer, type SchemaRendererProps} from './SchemaRenderer';
Expand Down
7 changes: 4 additions & 3 deletions src/lib/unstable/kit/entities/FewOfNested/FewOfNested.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
SchemaRendererMode,
SchemaRendererNode,
SchemaRendererNodeContext,
createSchemaRendererNodeContextRuler,
getRenderKit,
useSchemaRendererState,
} from '../../../core';
Expand Down Expand Up @@ -129,7 +130,7 @@ export const FewOfNested: NodeEntity<JsonSchemaObject, FewOfNestedProps> = ({
}
}

const nodeContext = {
const nodeContextRuler = createSchemaRendererNodeContextRuler({
headName,
input: togglerInput,
meta: togglerMeta,
Expand All @@ -139,10 +140,10 @@ export const FewOfNested: NodeEntity<JsonSchemaObject, FewOfNestedProps> = ({
schema: togglerSchema,
schemaPath: togglerSchemaPath,
settings,
};
});

return (
<SchemaRendererNodeContext.Provider value={nodeContext}>
<SchemaRendererNodeContext.Provider value={nodeContextRuler}>
{result}
</SchemaRendererNodeContext.Provider>
);
Expand Down
7 changes: 4 additions & 3 deletions src/lib/unstable/kit/entities/OneOfNested/OneOfNested.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
SchemaRendererMode,
SchemaRendererNode,
SchemaRendererNodeContext,
createSchemaRendererNodeContextRuler,
getRenderKit,
useSchemaRendererState,
} from '../../../core';
Expand Down Expand Up @@ -124,7 +125,7 @@ export const OneOfNested: NodeEntity<JsonSchemaObject, OneOfNestedProps> = ({
}
}

const nodeContext = {
const nodeContextRuler = createSchemaRendererNodeContextRuler({
headName,
input: togglerInput,
meta: togglerMeta,
Expand All @@ -134,10 +135,10 @@ export const OneOfNested: NodeEntity<JsonSchemaObject, OneOfNestedProps> = ({
schema: togglerSchema,
schemaPath: togglerSchemaPath,
settings,
};
});

return (
<SchemaRendererNodeContext.Provider value={nodeContext}>
<SchemaRendererNodeContext.Provider value={nodeContextRuler}>
{result}
</SchemaRendererNodeContext.Provider>
);
Expand Down
Loading