Skip to content

feat: get keys on value render #74

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
merged 1 commit into from
Jul 31, 2025
Merged

feat: get keys on value render #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions core/src/comps/KeyValues.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ export const KeyValues = <T extends object>(props: KeyValuesProps<T>) => {
const defaultExpanded =
typeof collapsed === 'boolean' ? collapsed : typeof collapsed === 'number' ? level > collapsed : false;
const isExpanded = expands[expandKey] ?? defaultExpanded;
const shouldExpand = shouldExpandNodeInitially && shouldExpandNodeInitially(!isExpanded, { value, keys, level });
if (expands[expandKey] === undefined && shouldExpandNodeInitially && !shouldExpand) {
if (
expands[expandKey] === undefined &&
shouldExpandNodeInitially &&
shouldExpandNodeInitially(isExpanded, { value, keys, level })
) {
return null;
}
if (isExpanded) {
Expand Down Expand Up @@ -116,7 +119,7 @@ export const KeyValuesItem = <T extends object>(props: KeyValuesProps<T>) => {
return (
<RowComp className="w-rjv-line" value={value} keyName={keyName} keys={keys} parentValue={parentValue} {...reset}>
<KayName keyName={keyName} value={value} keys={keys} parentValue={parentValue} />
<Value keyName={keyName!} value={value} />
<Value keyName={keyName!} value={value} keys={keys} />
<Copied keyName={keyName} value={value as object} keys={keys} parentValue={parentValue} expandKey={subkeyid} />
</RowComp>
);
Expand Down
5 changes: 3 additions & 2 deletions core/src/comps/Value.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ export const isFloat = (n: number) => (Number(n) === n && n % 1 !== 0) || isNaN(
interface ValueProps {
value: unknown;
keyName: string | number;
keys?: (string | number)[];
}

export const Value = (props: ValueProps) => {
const { value, keyName } = props;
const reset = { keyName };
const { value, keyName, keys } = props;
const reset = { keyName, keys };
if (value instanceof URL) {
return <TypeUrl {...reset}>{value}</TypeUrl>;
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/store/Types.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ type TypesElementProps<T extends TagType = 'span'> = {
as?: T;
render?: (
props: TypesElement<T>,
result: { type: 'type' | 'value'; value?: unknown; keyName: string | number },
result: { type: 'type' | 'value'; value?: unknown; keyName: string | number; keys?: (string | number)[] },
) => React.ReactNode;
'data-type'?: string;
};
Expand Down
77 changes: 44 additions & 33 deletions core/src/types/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,10 @@ const defalutStyle: React.CSSProperties = {

type TypeProps = PropsWithChildren<{
keyName: string | number;
keys?: (string | number)[];
}>;

export const TypeString: FC<TypeProps> = ({ children = '', keyName }) => {
export const TypeString: FC<TypeProps> = ({ children = '', keyName, keys }) => {
const { Str = {}, displayDataTypes } = useTypesStore();
const { shortenTextAfterLength: length = 30, stringEllipsis = '...' } = useStore();
const { as, render, ...reset } = Str;
Expand All @@ -82,10 +83,10 @@ export const TypeString: FC<TypeProps> = ({ children = '', keyName }) => {
const text = shorten ? `${childrenStr.slice(0, length)}${stringEllipsis}` : childrenStr;

const isRender = render && typeof render === 'function';
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName });
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName, keys });
const cls = shorten ? 'w-rjv-value w-rjv-value-short' : 'w-rjv-value';
const child =
isRender && render({ ...reset, children: text, className: cls }, { type: 'value', value: children, keyName });
isRender && render({ ...reset, children: text, className: cls }, { type: 'value', value: children, keyName, keys });
return (
<Fragment>
{displayDataTypes && (type || <Comp {...reset} style={style} />)}
Expand All @@ -104,7 +105,7 @@ export const TypeString: FC<TypeProps> = ({ children = '', keyName }) => {

TypeString.displayName = 'JVR.TypeString';

export const TypeTrue: FC<TypeProps> = ({ children, keyName }) => {
export const TypeTrue: FC<TypeProps> = ({ children, keyName, keys }) => {
const { True = {}, displayDataTypes } = useTypesStore();
const { as, render, ...reset } = True;
const Comp = as || 'span';
Expand All @@ -114,9 +115,10 @@ export const TypeTrue: FC<TypeProps> = ({ children, keyName }) => {
};

const isRender = render && typeof render === 'function';
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName });
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName, keys });
const child =
isRender && render({ ...reset, children, className: 'w-rjv-value' }, { type: 'value', value: children, keyName });
isRender &&
render({ ...reset, children, className: 'w-rjv-value' }, { type: 'value', value: children, keyName, keys });
return (
<Fragment>
{displayDataTypes && (type || <Comp {...reset} style={style} />)}
Expand All @@ -131,7 +133,7 @@ export const TypeTrue: FC<TypeProps> = ({ children, keyName }) => {

TypeTrue.displayName = 'JVR.TypeTrue';

export const TypeFalse: FC<TypeProps> = ({ children, keyName }) => {
export const TypeFalse: FC<TypeProps> = ({ children, keyName, keys }) => {
const { False = {}, displayDataTypes } = useTypesStore();
const { as, render, ...reset } = False;
const Comp = as || 'span';
Expand All @@ -141,9 +143,10 @@ export const TypeFalse: FC<TypeProps> = ({ children, keyName }) => {
};

const isRender = render && typeof render === 'function';
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName });
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName, keys });
const child =
isRender && render({ ...reset, children, className: 'w-rjv-value' }, { type: 'value', value: children, keyName });
isRender &&
render({ ...reset, children, className: 'w-rjv-value' }, { type: 'value', value: children, keyName, keys });

return (
<Fragment>
Expand All @@ -159,7 +162,7 @@ export const TypeFalse: FC<TypeProps> = ({ children, keyName }) => {

TypeFalse.displayName = 'JVR.TypeFalse';

export const TypeFloat: FC<TypeProps> = ({ children, keyName }) => {
export const TypeFloat: FC<TypeProps> = ({ children, keyName, keys }) => {
const { Float = {}, displayDataTypes } = useTypesStore();
const { as, render, ...reset } = Float;
const Comp = as || 'span';
Expand All @@ -169,9 +172,10 @@ export const TypeFloat: FC<TypeProps> = ({ children, keyName }) => {
};

const isRender = render && typeof render === 'function';
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName });
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName, keys });
const child =
isRender && render({ ...reset, children, className: 'w-rjv-value' }, { type: 'value', value: children, keyName });
isRender &&
render({ ...reset, children, className: 'w-rjv-value' }, { type: 'value', value: children, keyName, keys });

return (
<Fragment>
Expand All @@ -187,7 +191,7 @@ export const TypeFloat: FC<TypeProps> = ({ children, keyName }) => {

TypeFloat.displayName = 'JVR.TypeFloat';

export const TypeInt: FC<TypeProps> = ({ children, keyName }) => {
export const TypeInt: FC<TypeProps> = ({ children, keyName, keys }) => {
const { Int = {}, displayDataTypes } = useTypesStore();
const { as, render, ...reset } = Int;
const Comp = as || 'span';
Expand All @@ -197,9 +201,10 @@ export const TypeInt: FC<TypeProps> = ({ children, keyName }) => {
};

const isRender = render && typeof render === 'function';
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName });
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName, keys });
const child =
isRender && render({ ...reset, children, className: 'w-rjv-value' }, { type: 'value', value: children, keyName });
isRender &&
render({ ...reset, children, className: 'w-rjv-value' }, { type: 'value', value: children, keyName, keys });

return (
<Fragment>
Expand All @@ -215,7 +220,7 @@ export const TypeInt: FC<TypeProps> = ({ children, keyName }) => {

TypeInt.displayName = 'JVR.TypeInt';

export const TypeBigint: FC<{ children?: BigInt } & Omit<TypeProps, 'children'>> = ({ children, keyName }) => {
export const TypeBigint: FC<{ children?: BigInt } & Omit<TypeProps, 'children'>> = ({ children, keyName, keys }) => {
const { Bigint: CompBigint = {}, displayDataTypes } = useTypesStore();
const { as, render, ...reset } = CompBigint;
const Comp = as || 'span';
Expand All @@ -225,9 +230,10 @@ export const TypeBigint: FC<{ children?: BigInt } & Omit<TypeProps, 'children'>>
};

const isRender = render && typeof render === 'function';
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName });
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName, keys });
const child =
isRender && render({ ...reset, children, className: 'w-rjv-value' }, { type: 'value', value: children, keyName });
isRender &&
render({ ...reset, children, className: 'w-rjv-value' }, { type: 'value', value: children, keyName, keys });

return (
<Fragment>
Expand All @@ -243,7 +249,7 @@ export const TypeBigint: FC<{ children?: BigInt } & Omit<TypeProps, 'children'>>

TypeBigint.displayName = 'JVR.TypeFloat';

export const TypeUrl: FC<{ children?: URL } & Omit<TypeProps, 'children'>> = ({ children, keyName }) => {
export const TypeUrl: FC<{ children?: URL } & Omit<TypeProps, 'children'>> = ({ children, keyName, keys }) => {
const { Url = {}, displayDataTypes } = useTypesStore();
const { as, render, ...reset } = Url;
const Comp = as || 'span';
Expand All @@ -253,12 +259,12 @@ export const TypeUrl: FC<{ children?: URL } & Omit<TypeProps, 'children'>> = ({
};

const isRender = render && typeof render === 'function';
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName });
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName, keys });
const child =
isRender &&
render(
{ ...reset, children: children?.href, className: 'w-rjv-value' },
{ type: 'value', value: children, keyName },
{ type: 'value', value: children, keyName, keys },
);

return (
Expand All @@ -277,7 +283,7 @@ export const TypeUrl: FC<{ children?: URL } & Omit<TypeProps, 'children'>> = ({

TypeUrl.displayName = 'JVR.TypeUrl';

export const TypeDate: FC<{ children?: Date } & Omit<TypeProps, 'children'>> = ({ children, keyName }) => {
export const TypeDate: FC<{ children?: Date } & Omit<TypeProps, 'children'>> = ({ children, keyName, keys }) => {
const { Date: CompData = {}, displayDataTypes } = useTypesStore();
const { as, render, ...reset } = CompData;
const Comp = as || 'span';
Expand All @@ -287,11 +293,14 @@ export const TypeDate: FC<{ children?: Date } & Omit<TypeProps, 'children'>> = (
};

const isRender = render && typeof render === 'function';
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName });
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName, keys });
const childStr = children instanceof Date ? children.toLocaleString() : children;
const child =
isRender &&
render({ ...reset, children: childStr, className: 'w-rjv-value' }, { type: 'value', value: children, keyName });
render(
{ ...reset, children: childStr, className: 'w-rjv-value' },
{ type: 'value', value: children, keyName, keys },
);

return (
<Fragment>
Expand All @@ -307,7 +316,7 @@ export const TypeDate: FC<{ children?: Date } & Omit<TypeProps, 'children'>> = (

TypeDate.displayName = 'JVR.TypeDate';

export const TypeUndefined: FC<TypeProps> = ({ children, keyName }) => {
export const TypeUndefined: FC<TypeProps> = ({ children, keyName, keys }) => {
const { Undefined = {}, displayDataTypes } = useTypesStore();
const { as, render, ...reset } = Undefined;
const Comp = as || 'span';
Expand All @@ -317,9 +326,10 @@ export const TypeUndefined: FC<TypeProps> = ({ children, keyName }) => {
};

const isRender = render && typeof render === 'function';
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName });
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName, keys });
const child =
isRender && render({ ...reset, children, className: 'w-rjv-value' }, { type: 'value', value: children, keyName });
isRender &&
render({ ...reset, children, className: 'w-rjv-value' }, { type: 'value', value: children, keyName, keys });

return (
<Fragment>
Expand All @@ -331,7 +341,7 @@ export const TypeUndefined: FC<TypeProps> = ({ children, keyName }) => {

TypeUndefined.displayName = 'JVR.TypeUndefined';

export const TypeNull: FC<TypeProps> = ({ children, keyName }) => {
export const TypeNull: FC<TypeProps> = ({ children, keyName, keys }) => {
const { Null = {}, displayDataTypes } = useTypesStore();
const { as, render, ...reset } = Null;
const Comp = as || 'span';
Expand All @@ -341,9 +351,10 @@ export const TypeNull: FC<TypeProps> = ({ children, keyName }) => {
};

const isRender = render && typeof render === 'function';
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName });
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName, keys });
const child =
isRender && render({ ...reset, children, className: 'w-rjv-value' }, { type: 'value', value: children, keyName });
isRender &&
render({ ...reset, children, className: 'w-rjv-value' }, { type: 'value', value: children, keyName, keys });

return (
<Fragment>
Expand All @@ -355,7 +366,7 @@ export const TypeNull: FC<TypeProps> = ({ children, keyName }) => {

TypeNull.displayName = 'JVR.TypeNull';

export const TypeNan: FC<TypeProps> = ({ children, keyName }) => {
export const TypeNan: FC<TypeProps> = ({ children, keyName, keys }) => {
const { Nan = {}, displayDataTypes } = useTypesStore();
const { as, render, ...reset } = Nan;
const Comp = as || 'span';
Expand All @@ -365,12 +376,12 @@ export const TypeNan: FC<TypeProps> = ({ children, keyName }) => {
};

const isRender = render && typeof render === 'function';
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName });
const type = isRender && render({ ...reset, style }, { type: 'type', value: children, keyName, keys });
const child =
isRender &&
render(
{ ...reset, children: children?.toString(), className: 'w-rjv-value' },
{ type: 'value', value: children, keyName },
{ type: 'value', value: children, keyName, keys },
);

return (
Expand Down