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

WP-Builder: Introduce new Horizontal layout #82

Merged
merged 1 commit into from
Jul 31, 2023
Merged

WP-Builder: Introduce new Horizontal layout #82

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
20 changes: 14 additions & 6 deletions src/js/component/form.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import GutenbergArrayRenderer, { gutenbergArrayControlTester } from "../renderer
import PortedArrayRenderer, { portedArrayControlTester } from "../renderers/PortedArrayRenderer";
import GutenbergNavigatorlLayoutRenderer, { gutenbergNavigatorLayoutTester } from "../renderers/NavigatorLayout";
import GutenbergVerticalLayoutRenderer, { gutenbergVerticalLayoutTester } from "../renderers/GutenbergVerticalLayout";
import GutenbergHorizontalLayoutRenderer, { gutenbergHorizontalLayoutTester } from "../renderers/GutenbergHorizontalLayout";

import {
__experimentalGrid as Grid,
Expand Down Expand Up @@ -95,13 +96,19 @@ const schema = {
};

const uischema = {
type: 'NavigatorLayout',
elements: [
"type": "HorizontalLayout",
"elements": [
{
type: "Control",
scope: "#",
"type": "Control",
"label": "Name",
"scope": "#/properties/business/properties/job"
},
{
"type": "Control",
"label": "Birth Date",
"scope": "#/properties/business/properties/experience"
}
],
]
}

const initialData = {
Expand Down Expand Up @@ -131,7 +138,8 @@ const renderers = [
{ tester: gutenbergArrayControlTester, renderer: GutenbergArrayRenderer},
// { tester: portedArrayControlTester, renderer: PortedArrayRenderer},
{ tester: gutenbergNavigatorLayoutTester, renderer: GutenbergNavigatorlLayoutRenderer},
{ tester: gutenbergVerticalLayoutTester, renderer: GutenbergVerticalLayoutRenderer}
{ tester: gutenbergVerticalLayoutTester, renderer: GutenbergVerticalLayoutRenderer},
{ tester: gutenbergHorizontalLayoutTester, renderer: GutenbergHorizontalLayoutRenderer}
];

export default function App() {
Expand Down
43 changes: 43 additions & 0 deletions src/js/renderers/GutenbergHorizontalLayout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import React from "react";
import { rankWith, uiTypeIs } from "@jsonforms/core";
import { GutenbergLayoutRenderer } from "./LayoutRenderer";
import { withJsonFormsLayoutProps } from "@jsonforms/react";

/**
* Default tester for a Horizontal layout.
* @type {RankedTester}
*/
export const gutenbergHorizontalLayoutTester = rankWith(
4,
uiTypeIs("HorizontalLayout")
)

export const GutenbergHorizontalLayoutRenderer = ( {
uischema,
schema,
path,
enabled,
visible,
renderers,
cells
} ) => {
const HorizontalLayout = uischema
const childProps = {
elements: HorizontalLayout.elements,
schema,
path,
enabled,
direction: "row",
visible
}

return (
<GutenbergLayoutRenderer
{...childProps}
renderers={renderers}
cells={cells}
/>
)
}

export default withJsonFormsLayoutProps( GutenbergHorizontalLayoutRenderer )
8 changes: 4 additions & 4 deletions src/js/renderers/GutenbergVerticalLayout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ import { withJsonFormsLayoutProps } from "@jsonforms/react";
* @type {RankedTester}
*/
export const gutenbergVerticalLayoutTester = rankWith(
1,
4,
uiTypeIs("VerticalLayout")
)

export const GutenbergVerticalLayoutRenderer = ({
export const GutenbergVerticalLayoutRenderer = ( {
uischema,
schema,
path,
enabled,
visible,
renderers,
cells
}) => {
} ) => {
const verticalLayout = uischema
const childProps = {
elements: verticalLayout.elements,
Expand All @@ -40,4 +40,4 @@ export const GutenbergVerticalLayoutRenderer = ({
)
}

export default withJsonFormsLayoutProps(GutenbergVerticalLayoutRenderer)
export default withJsonFormsLayoutProps( GutenbergVerticalLayoutRenderer )
8 changes: 5 additions & 3 deletions src/js/renderers/LayoutRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { getAjv } from "@jsonforms/core";
import { JsonFormsDispatch, useJsonForms } from "@jsonforms/react";
import {
__experimentalGrid as Grid,
__experimentalView as View,
} from '@wordpress/components';

export const renderLayoutElements = (
Expand All @@ -15,7 +16,7 @@ export const renderLayoutElements = (
cells
) => {
return elements.map( (child, index) => (
<Grid key={ `${ path }-${ index }` }>
<View key={ `${ path }-${ index }` }>
<JsonFormsDispatch
uischema={ child }
schema={ schema }
Expand All @@ -24,7 +25,7 @@ export const renderLayoutElements = (
renderers={ renderers }
cells={ cells }
/>
</Grid>
</View>
) )
}

Expand All @@ -45,6 +46,7 @@ const LayoutRendererComponent = ( {
!visible ? null : (
<Grid
gap={ direction === "row" ? 2 : 0 }
columns={ direction === "row" ? elements.length : 1 }
>
{ renderLayoutElements(
elements,
Expand All @@ -60,7 +62,7 @@ const LayoutRendererComponent = ( {
}
}
export const GutenbergLayoutRenderer = React.memo(
LayoutRendererComponent
LayoutRendererComponent
)

// TODO fix @typescript-eslint/ban-types
Expand Down