Skip to content
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

Jump to bottom

Feature/include types #8

Merged
merged 2 commits into from
Jun 2, 2021
Merged

Feature/include types #8

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
ebfc650
bump version
Jun 2, 2021
cce20c1
refactor to include typescript.types exported
Jun 2, 2021
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
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@optum/json-schema-editor",
"version": "2.0.1",
"version": "2.0.3",
"description": "JsonSchema Editor React Control",
"repository": "https://github.com/optum/jsonschema-editor-react",
"license": "Apache 2.0",
"engines": {
"node": ">=10.18.0 <11 || >=12.14.0 <13 || >=13.5.0"
},
"source": "src/JsonSchemaEditor/index.ts",
"source": "src/index.ts",
"publishConfig": {
"access": "public",
"registry": "https://registry.npmjs.org"
Expand Down
40 changes: 20 additions & 20 deletions src/JsonSchemaEditor.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
import React from "react";
import { render } from "@testing-library/react";

import JsonSchemaEditor from "./JsonSchemaEditor";
import { SchemaEditorProps } from "./JsonSchemaEditor/JsonSchemaEditor.types";
import JsonSchemaEditor from ".";
import { SchemaEditorProps } from "./JsonSchemaEditor.types";

const printIt = (schema: string) => {
console.log(schema);
console.log(schema);
};

describe("JsonSchemaEditor", () => {
let props: SchemaEditorProps;
let props: SchemaEditorProps;

beforeEach(() => {
props = {
onSchemaChange: printIt,
};
});
beforeEach(() => {
props = {
onSchemaChange: printIt,
};
});

const renderComponent = () => render(<JsonSchemaEditor {...props} />);
const renderComponent = () => render(<JsonSchemaEditor {...props} />);

it("should have primary className with default props", () => {
renderComponent();
it("should have primary className with default props", () => {
renderComponent();

const { container } = renderComponent();
const { container } = renderComponent();

// const testComponent = getByTestId("jsonschema-editor");
console.log(container.innerHTML);
// const testComponent = getByTestId("jsonschema-editor");
console.log(container.innerHTML);

// expect(testComponent).toHaveClass("test-component-primary");
// expect(testComponent).toHaveClass("test-component-primary");

// console.log(result.asFragment.toString);
// // expect(screen.getByText("root")).toBeInTheDocument();
// expect(true).toBe(true);
});
// console.log(result.asFragment.toString);
// // expect(screen.getByText("root")).toBeInTheDocument();
// expect(true).toBe(true);
});
});

// test("renders learn react link", () => {
Expand Down
0 ...sonSchemaEditor/JsonSchemaEditor.types.ts → src/JsonSchemaEditor.types.ts
View file
Open in desktop
File renamed without changes.
78 changes: 39 additions & 39 deletions src/JsonSchemaEditor/JsonSchemaEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
import * as React from "react";
import { useState } from "@hookstate/core";
import { useSchemaState, defaultSchema } from "./state";
import { SchemaEditorProps } from "./JsonSchemaEditor.types";
import { SchemaEditorProps } from "../JsonSchemaEditor.types";
import { Flex, ChakraProvider, theme } from "@chakra-ui/react";

import { SchemaRoot } from "./schema-root";
import { Whoops } from "./whoops";
import { SchemaObject } from "./schema-object";
import { SchemaArray } from "./schema-array";

export * from "./JsonSchemaEditor.types";
export * from "../JsonSchemaEditor.types";

export const JsonSchemaEditor = (props: SchemaEditorProps) => {
const { onSchemaChange, readOnly, data } = props;
const { onSchemaChange, readOnly, data } = props;

const schemaState = useSchemaState({
jsonSchema: data ?? defaultSchema(),
isReadOnly: readOnly ?? false,
fieldId: 0,
});
const schemaState = useSchemaState({
jsonSchema: data ?? defaultSchema(),
isReadOnly: readOnly ?? false,
fieldId: 0,
});

const jsonSchemaState = useState(schemaState.jsonSchema);
const jsonSchemaState = useState(schemaState.jsonSchema);

return (
<ChakraProvider theme={theme}>
{schemaState.isValidSchema ? (
<Flex m={2} direction="column">
<SchemaRoot
onSchemaChange={onSchemaChange}
schemaState={schemaState.jsonSchema}
isReadOnly={schemaState.isReadOnly}
/>
return (
<ChakraProvider theme={theme}>
{schemaState.isValidSchema ? (
<Flex m={2} direction="column">
<SchemaRoot
onSchemaChange={onSchemaChange}
schemaState={schemaState.jsonSchema}
isReadOnly={schemaState.isReadOnly}
/>

{jsonSchemaState.type.value === "object" && (
<SchemaObject
schemaState={jsonSchemaState}
isReadOnly={schemaState.isReadOnly ?? false}
/>
)}
{jsonSchemaState.type.value === "object" && (
<SchemaObject
schemaState={jsonSchemaState}
isReadOnly={schemaState.isReadOnly ?? false}
/>
)}

{jsonSchemaState.type.value === "array" && (
<SchemaArray
schemaState={jsonSchemaState}
isReadOnly={schemaState.isReadOnly ?? false}
/>
)}
</Flex>
) : (
<Flex alignContent="center" justifyContent="center">
<Whoops />
</Flex>
)}
{/* <Modal
{jsonSchemaState.type.value === "array" && (
<SchemaArray
schemaState={jsonSchemaState}
isReadOnly={schemaState.isReadOnly ?? false}
/>
)}
</Flex>
) : (
<Flex alignContent="center" justifyContent="center">
<Whoops />
</Flex>
)}
{/* <Modal
isOpen={localState.isAdvancedOpen.get()}
finalFocusRef={focusRef}
size="lg"
Expand All @@ -77,6 +77,6 @@ export const JsonSchemaEditor = (props: SchemaEditorProps) => {
</ModalFooter>
</ModalContent>
</Modal> */}
</ChakraProvider>
);
</ChakraProvider>
);
};
72 changes: 36 additions & 36 deletions src/JsonSchemaEditor/advanced-boolean/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
import * as React from "react";
import { Flex, FormLabel, Stack, Select } from "@chakra-ui/react";

import { AdvancedItemStateProps } from "../JsonSchemaEditor.types";
import { AdvancedItemStateProps } from "../../JsonSchemaEditor.types";
import { useState } from "@hookstate/core";

export const AdvancedBoolean: React.FunctionComponent<AdvancedItemStateProps> = (
props: React.PropsWithChildren<AdvancedItemStateProps>
props: React.PropsWithChildren<AdvancedItemStateProps>
) => {
const { itemStateProp } = props;
const { itemStateProp } = props;

const item = useState(itemStateProp);
const item = useState(itemStateProp);

return (
<Flex direction="column" wrap="nowrap">
<Stack
isInline
alignItems="center"
justifyContent="center"
alignContent="center"
m={1}
>
<FormLabel mr={2} htmlFor="default">
Default:{" "}
</FormLabel>
<Select
variant="outline"
value={(item.default.value as string) ?? ""}
size="sm"
margin={2}
placeholder="Choose data type"
onChange={(evt: React.ChangeEvent<HTMLSelectElement>) => {
item.default.set(evt.target.value);
}}
>
<option key="true" value="true">
true
</option>
<option key="false" value="false">
false
</option>
</Select>
</Stack>
</Flex>
);
return (
<Flex direction="column" wrap="nowrap">
<Stack
isInline
alignItems="center"
justifyContent="center"
alignContent="center"
m={1}
>
<FormLabel mr={2} htmlFor="default">
Default:{" "}
</FormLabel>
<Select
variant="outline"
value={(item.default.value as string) ?? ""}
size="sm"
margin={2}
placeholder="Choose data type"
onChange={(evt: React.ChangeEvent<HTMLSelectElement>) => {
item.default.set(evt.target.value);
}}
>
<option key="true" value="true">
true
</option>
<option key="false" value="false">
false
</option>
</Select>
</Stack>
</Flex>
);
};
Loading