@darajs/components 1.5.2 → 1.6.0

package/dist/common/card/card.d.ts

@@ -1,9 +1,9 @@
-import { ComponentInstance, StyledComponentProps } from '@darajs/core';
+import { ComponentInstance, LayoutComponentProps } from '@darajs/core';
 interface BaseCardProps {
     accent?: boolean;
 }
 export declare const CardDiv: import("styled-components").StyledComponent<import("styled-components").StyledComponent<"div", import("@darajs/styled-components").DefaultTheme, BaseCardProps, never>, import("@darajs/styled-components").DefaultTheme, import("@darajs/core").RawCssProp>;
-interface CardProps extends StyledComponentProps {
+interface CardProps extends LayoutComponentProps {
     /** Whether card should be filled with accent gradient or plain */
     accent?: boolean;
     /** Content to be displayed in the main card */

package/dist/common/card/card.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"card.d.ts","sourceRoot":"","sources":["../../../js/common/card/card.tsx"],"names":[],"mappings":"AAEA,OAAO,EACH,iBAAiB,EAGjB,oBAAoB,EAGvB,MAAM,cAAc,CAAC;AAGtB,UAAU,aAAa;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,OAAO,8PAyBlB,CAAC;AAoCH,UAAU,SAAU,SAAQ,oBAAoB;IAC5C,kEAAkE;IAClE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,+CAA+C;IAC/C,QAAQ,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACnC,qCAAqC;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oCAAoC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;GAKG;AACH,iBAAS,IAAI,CAAC,KAAK,EAAE,SAAS,GAAG,GAAG,CAAC,OAAO,CAmB3C;AAED,eAAe,IAAI,CAAC"}
+{"version":3,"file":"card.d.ts","sourceRoot":"","sources":["../../../js/common/card/card.tsx"],"names":[],"mappings":"AAEA,OAAO,EACH,iBAAiB,EAGjB,oBAAoB,EAGvB,MAAM,cAAc,CAAC;AAGtB,UAAU,aAAa;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,OAAO,8PAyBlB,CAAC;AAoCH,UAAU,SAAU,SAAQ,oBAAoB;IAC5C,kEAAkE;IAClE,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,+CAA+C;IAC/C,QAAQ,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACnC,qCAAqC;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oCAAoC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;GAKG;AACH,iBAAS,IAAI,CAAC,KAAK,EAAE,SAAS,GAAG,GAAG,CAAC,OAAO,CAuB3C;AAED,eAAe,IAAI,CAAC"}

package/dist/common/card/card.js

@@ -48,7 +48,10 @@ const Subtitle = styled.span `
  */
 function Card(props) {
     const [style, css] = useComponentStyles(props);
-    return (_jsxs(CardDiv, { "$rawCss": css, accent: props.accent, style: style, children: [props.title && _jsx(Title, { children: props.title }), props.subtitle && _jsx(Subtitle, { hasTitle: props.title !== null, children: props.subtitle }), _jsx(ChildrenWrapper, { "data-type": "children-wrapper", hasSubtitle: props.subtitle !== null, hasTitle: props.title !== null, children: _jsx(DisplayCtx.Provider, { value: { component: 'card', direction: 'vertical' }, children: props.children.map((child, idx) => (_jsx(DynamicComponent, { component: child }, `card-${idx}-${child.name}`))) }) })] }));
+    return (_jsxs(CardDiv, { "$rawCss": css, accent: props.accent, style: style, children: [props.title && _jsx(Title, { children: props.title }), props.subtitle && _jsx(Subtitle, { hasTitle: props.title !== null, children: props.subtitle }), _jsx(ChildrenWrapper, { "data-type": "children-wrapper", hasSubtitle: props.subtitle !== null, hasTitle: props.title !== null, style: {
+                    alignItems: props.align,
+                    justifyContent: props.justify,
+                }, children: _jsx(DisplayCtx.Provider, { value: { component: 'card', direction: 'vertical' }, children: props.children.map((child, idx) => (_jsx(DynamicComponent, { component: child }, `card-${idx}-${child.name}`))) }) })] }));
 }
 export default Card;
 //# sourceMappingURL=card.js.map

package/dist/common/card/card.js.map

@@ -1 +1 @@
-{"version":3,"file":"card.js","sourceRoot":"","sources":["../../../js/common/card/card.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAE1C,OAAO,EAEH,UAAU,EACV,gBAAgB,EAEhB,SAAS,EACT,kBAAkB,GACrB,MAAM,cAAc,CAAC;AACtB,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAM/C,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,GAAG,CAAe;;;;;;;;aAQ7C,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI;;kBAE7B,CAAC,KAAK,EAAE,EAAE,CACpB,KAAK,CAAC,MAAM;IACR,CAAC,CAAC,qDAAqD,cAAc,CAC/D,GAAG,EACH,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAChC,QAAQ,cAAc,CACnB,GAAG,EACH,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAC3B,4DAA4D,cAAc,CACvE,GAAG,EACH,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAC3B,QAAQ,cAAc,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ;IAChE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK;;kBAEpB,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM;CACrD,CAAC,CAAC;AAOH,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAsB;;;;;;;kBAOtC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;CACtF,CAAC;AAEF,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAA;;;;CAIxB,CAAC;AAMF,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAe;kBACzB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;;;;aAIrD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK;;CAE/C,CAAC;AAaF;;;;;GAKG;AACH,SAAS,IAAI,CAAC,KAAgB;IAC1B,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC/C,OAAO,CACH,MAAC,OAAO,eAAU,GAAG,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,aACpD,KAAK,CAAC,KAAK,IAAI,KAAC,KAAK,cAAE,KAAK,CAAC,KAAK,GAAS,EAC3C,KAAK,CAAC,QAAQ,IAAI,KAAC,QAAQ,IAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,KAAK,IAAI,YAAG,KAAK,CAAC,QAAQ,GAAY,EACxF,KAAC,eAAe,iBACF,kBAAkB,EAC5B,WAAW,EAAE,KAAK,CAAC,QAAQ,KAAK,IAAI,EACpC,QAAQ,EAAE,KAAK,CAAC,KAAK,KAAK,IAAI,YAE9B,KAAC,UAAU,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,YACnE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAwB,EAAE,GAAW,EAAE,EAAE,CAAC,CAC3D,KAAC,gBAAgB,IAAC,SAAS,EAAE,KAAK,IAAO,QAAQ,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE,CAAI,CAC3E,CAAC,GACgB,GACR,IACZ,CACb,CAAC;AACN,CAAC;AAED,eAAe,IAAI,CAAC"}
+{"version":3,"file":"card.js","sourceRoot":"","sources":["../../../js/common/card/card.tsx"],"names":[],"mappings":"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"}

package/dist/common/form/form.d.ts

@@ -1,5 +1,5 @@
-import { Action, ComponentInstance, StyledComponentProps, Variable } from '@darajs/core';
-interface FormProps extends StyledComponentProps {
+import { Action, ComponentInstance, LayoutComponentProps, Variable } from '@darajs/core';
+interface FormProps extends LayoutComponentProps {
     children: Array<ComponentInstance>;
     /** Action for what happens when the button is clicked */
     onsubmit: Action;

package/dist/common/form/form.js

@@ -40,7 +40,7 @@ function Form(props) {
         return props.children.filter((child) => child.name === 'FormPage');
     }, [props.children]);
     const [currentPage, setCurrentPage] = useState(0);
-    return (_jsx(FormCtx.Provider, { value: { formValues: formState, resolveInitialValue, updateForm }, children: _jsxs(StyledForm, { "$rawCss": css, className: props.className, style: style, children: [pages.length === 0 && (_jsxs(FormWrapper, { children: [props.children.map((child, idx) => (_jsx(DynamicComponent, { component: child }, `form-${idx}-${child.uid}`))), _jsx(ButtonWrapper, { children: props.onsubmit && (_jsx(Button, { onClick: () => onSubmit(formState), styling: "primary", children: "Submit" })) })] })), pages.length > 0 && (_jsxs(FormWrapper, { children: [_jsx(DynamicComponent, { component: props.children[currentPage] }), _jsxs(ButtonWrapper, { children: [currentPage < pages.length - 1 && (_jsx(Button, { onClick: () => setCurrentPage(currentPage + 1), styling: "primary", children: "Next" })), currentPage === pages.length - 1 && props.onsubmit && (_jsx(Button, { onClick: () => onSubmit(formState), styling: "primary", children: "Submit" })), currentPage > 0 && pages.length > 1 && (_jsx(Button, { onClick: () => setCurrentPage(currentPage - 1), outline: true, styling: "primary", children: "Back" }))] })] }))] }) }));
+    return (_jsx(FormCtx.Provider, { value: { formValues: formState, resolveInitialValue, updateForm }, children: _jsxs(StyledForm, { "$rawCss": css, className: props.className, style: style, children: [pages.length === 0 && (_jsxs(FormWrapper, { style: { alignItems: props.align, justifyContent: props.justify }, children: [props.children.map((child, idx) => (_jsx(DynamicComponent, { component: child }, `form-${idx}-${child.uid}`))), _jsx(ButtonWrapper, { children: props.onsubmit && (_jsx(Button, { onClick: () => onSubmit(formState), styling: "primary", children: "Submit" })) })] })), pages.length > 0 && (_jsxs(FormWrapper, { children: [_jsx(DynamicComponent, { component: props.children[currentPage] }), _jsxs(ButtonWrapper, { children: [currentPage < pages.length - 1 && (_jsx(Button, { onClick: () => setCurrentPage(currentPage + 1), styling: "primary", children: "Next" })), currentPage === pages.length - 1 && props.onsubmit && (_jsx(Button, { onClick: () => onSubmit(formState), styling: "primary", children: "Submit" })), currentPage > 0 && pages.length > 1 && (_jsx(Button, { onClick: () => setCurrentPage(currentPage - 1), outline: true, styling: "primary", children: "Back" }))] })] }))] }) }));
 }
 export default Form;
 //# sourceMappingURL=form.js.map

package/dist/common/form/form.js.map

@@ -1 +1 @@
-{"version":3,"file":"form.js","sourceRoot":"","sources":["../../../js/common/form/form.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"form.js","sourceRoot":"","sources":["../../../js/common/form/form.tsx"],"names":[],"mappings":"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"}

package/dist/common/grid/column.d.ts

@@ -1,14 +1,10 @@
-import { ComponentInstance, StyledComponentProps } from '@darajs/core';
+import { ComponentInstance, LayoutComponentProps } from '@darajs/core';
 import { Breakpoints } from '../types';
-export interface ColumnProps extends StyledComponentProps {
-    /** css align-item value, for vertical alignment of this column */
-    align_items?: string;
+export interface ColumnProps extends LayoutComponentProps {
     /** array of children of column */
     children: Array<ComponentInstance>;
     /** An optional value which determines the direction of the Column children by default is horizontal */
     direction?: 'horizontal' | 'vertical';
-    /** css justify_content value, for horizontal alignment of this column */
-    justify?: string;
     /** how many columns should this column be offset by */
     offset?: number | Breakpoints;
     /** how many columns should this column span */

package/dist/common/grid/column.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"column.d.ts","sourceRoot":"","sources":["../../../js/common/grid/column.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,iBAAiB,EAGjB,oBAAoB,EAGvB,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAGvC,MAAM,WAAW,WAAY,SAAQ,oBAAoB;IACrD,kEAAkE;IAClE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kCAAkC;IAClC,QAAQ,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACnC,uGAAuG;IACvG,SAAS,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC;IACtC,yEAAyE;IACzE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uDAAuD;IACvD,MAAM,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC9B,+CAA+C;IAC/C,IAAI,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;CAC/B;AAYD;;;;GAIG;AACH,iBAAS,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG,GAAG,CAAC,OAAO,CAoB/C;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"column.d.ts","sourceRoot":"","sources":["../../../js/common/grid/column.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,iBAAiB,EAGjB,oBAAoB,EAGvB,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAGvC,MAAM,WAAW,WAAY,SAAQ,oBAAoB;IACrD,kCAAkC;IAClC,QAAQ,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACnC,uGAAuG;IACvG,SAAS,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC;IACtC,uDAAuD;IACvD,MAAM,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;IAC9B,+CAA+C;IAC/C,IAAI,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC;CAC/B;AAYD;;;;GAIG;AACH,iBAAS,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG,GAAG,CAAC,OAAO,CAoB/C;AAED,eAAe,MAAM,CAAC"}

package/dist/common/grid/column.js

@@ -16,7 +16,7 @@ const StyledColumn = injectCss(ColumnComponent);
  */
 function Column(props) {
     const [style, css] = useComponentStyles(props);
-    return (_jsx(StyledColumn, { "$rawCss": css, className: props.className, direction: props.direction, style: Object.assign({ alignItems: props.align_items, justifyContent: props.justify }, style), children: _jsx(DisplayCtx.Provider, { value: { component: 'column', direction: props.direction }, children: props.children.map((child, idx) => (_jsx(DynamicComponent, { component: child }, `cell-${idx}-${child.uid}`))) }) }));
+    return (_jsx(StyledColumn, { "$rawCss": css, className: props.className, direction: props.direction, style: Object.assign({ alignItems: props.align, justifyContent: props.justify }, style), children: _jsx(DisplayCtx.Provider, { value: { component: 'column', direction: props.direction }, children: props.children.map((child, idx) => (_jsx(DynamicComponent, { component: child }, `cell-${idx}-${child.uid}`))) }) }));
 }
 export default Column;
 //# sourceMappingURL=column.js.map

package/dist/common/grid/column.js.map

@@ -1 +1 @@
-{"version":3,"file":"column.js","sourceRoot":"","sources":["../../../js/common/grid/column.tsx"],"names":[],"mappings":";AAAA,OAAO,EAEH,UAAU,EACV,gBAAgB,EAEhB,SAAS,EACT,kBAAkB,GACrB,MAAM,cAAc,CAAC;AACtB,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAoB/C,MAAM,eAAe,GAAG,SAAS,CAAC,MAAM,CAAC,GAAG,CAAa;;;;sBAInC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,KAAK,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;;CAErF,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,SAAS,CAAC,eAAe,CAAC,CAAC;AAEhD;;;;GAIG;AACH,SAAS,MAAM,CAAC,KAAkB;IAC9B,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC/C,OAAO,CACH,KAAC,YAAY,eACA,GAAG,EACZ,SAAS,EAAE,KAAK,CAAC,SAAS,EAC1B,SAAS,EAAE,KAAK,CAAC,SAAS,EAC1B,KAAK,kBACD,UAAU,EAAE,KAAK,CAAC,WAAW,EAC7B,cAAc,EAAE,KAAK,CAAC,OAAO,IAC1B,KAAK,aAGZ,KAAC,UAAU,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,YAC1E,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAChC,KAAC,gBAAgB,IAAC,SAAS,EAAE,KAAK,IAAO,QAAQ,GAAG,IAAI,KAAK,CAAC,GAAG,EAAE,CAAI,CAC1E,CAAC,GACgB,GACX,CAClB,CAAC;AACN,CAAC;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"column.js","sourceRoot":"","sources":["../../../js/common/grid/column.tsx"],"names":[],"mappings":";AAAA,OAAO,EAEH,UAAU,EACV,gBAAgB,EAEhB,SAAS,EACT,kBAAkB,GACrB,MAAM,cAAc,CAAC;AACtB,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAgB/C,MAAM,eAAe,GAAG,SAAS,CAAC,MAAM,CAAC,GAAG,CAAa;;;;sBAInC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,KAAK,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;;CAErF,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,SAAS,CAAC,eAAe,CAAC,CAAC;AAEhD;;;;GAIG;AACH,SAAS,MAAM,CAAC,KAAkB;IAC9B,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC/C,OAAO,CACH,KAAC,YAAY,eACA,GAAG,EACZ,SAAS,EAAE,KAAK,CAAC,SAAS,EAC1B,SAAS,EAAE,KAAK,CAAC,SAAS,EAC1B,KAAK,kBACD,UAAU,EAAE,KAAK,CAAC,KAAK,EACvB,cAAc,EAAE,KAAK,CAAC,OAAO,IAC1B,KAAK,aAGZ,KAAC,UAAU,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,YAC1E,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAChC,KAAC,gBAAgB,IAAC,SAAS,EAAE,KAAK,IAAO,QAAQ,GAAG,IAAI,KAAK,CAAC,GAAG,EAAE,CAAI,CAC1E,CAAC,GACgB,GACX,CAClB,CAAC;AACN,CAAC;AAED,eAAe,MAAM,CAAC"}

package/dist/common/grid/grid.d.ts

@@ -1,6 +1,6 @@
-import { ComponentInstance, StyledComponentProps } from '@darajs/core';
+import { ComponentInstance, LayoutComponentProps } from '@darajs/core';
 import { Breakpoints } from '../types';
-interface GridProps extends StyledComponentProps {
+interface GridProps extends LayoutComponentProps {
     /** object containing when each of the five breakpoints should occur */
     breakpoints: Breakpoints;
     /** array of children of Grid component */

package/dist/common/grid/grid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid.d.ts","sourceRoot":"","sources":["../../../js/common/grid/grid.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,iBAAiB,EAGjB,oBAAoB,EAGvB,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAGvC,UAAU,SAAU,SAAQ,oBAAoB;IAC5C,uEAAuE;IACvE,WAAW,EAAE,WAAW,CAAC;IACzB,0CAA0C;IAC1C,QAAQ,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACnC,2BAA2B;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAUD;;;;GAIG;AACH,iBAAS,IAAI,CAAC,KAAK,EAAE,SAAS,GAAG,GAAG,CAAC,OAAO,CAoC3C;AAED,eAAe,IAAI,CAAC"}
+{"version":3,"file":"grid.d.ts","sourceRoot":"","sources":["../../../js/common/grid/grid.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,iBAAiB,EAGjB,oBAAoB,EAGvB,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAGvC,UAAU,SAAU,SAAQ,oBAAoB;IAC5C,uEAAuE;IACvE,WAAW,EAAE,WAAW,CAAC;IACzB,0CAA0C;IAC1C,QAAQ,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACnC,2BAA2B;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AAUD;;;;GAIG;AACH,iBAAS,IAAI,CAAC,KAAK,EAAE,SAAS,GAAG,GAAG,CAAC,OAAO,CAsC3C;AAED,eAAe,IAAI,CAAC"}

package/dist/common/grid/grid.js

@@ -25,7 +25,7 @@ function Grid(props) {
     const _children = props.children.map((child) => {
         return Object.assign(Object.assign({}, child), { props: Object.assign(Object.assign({}, child.props), { breakpoints, row_gap: props.row_gap }) });
     });
-    return (_jsx(StyledGrid, { "$rawCss": css, className: props.className, style: Object.assign({ rowGap: props.row_gap }, style), children: _jsx(DisplayCtx.Provider, { value: { component: 'grid', direction: 'vertical', hug: props.hug }, children: _children.map((child, idx) => (_jsx(DynamicComponent, { component: child }, `grid-${idx}-${child.uid}`))) }) }));
+    return (_jsx(StyledGrid, { "$rawCss": css, className: props.className, style: Object.assign({ alignItems: props.align, justifyContent: props.justify, rowGap: props.row_gap }, style), children: _jsx(DisplayCtx.Provider, { value: { component: 'grid', direction: 'vertical', hug: props.hug }, children: _children.map((child, idx) => (_jsx(DynamicComponent, { component: child }, `grid-${idx}-${child.uid}`))) }) }));
 }
 export default Grid;
 //# sourceMappingURL=grid.js.map

package/dist/common/grid/grid.js.map

@@ -1 +1 @@
-{"version":3,"file":"grid.js","sourceRoot":"","sources":["../../../js/common/grid/grid.tsx"],"names":[],"mappings":";AAAA,OAAO,EAEH,UAAU,EACV,gBAAgB,EAEhB,SAAS,EACT,kBAAkB,GACrB,MAAM,cAAc,CAAC;AACtB,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAc/C,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA;;;;CAI/B,CAAC;AAEF,MAAM,UAAU,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;AAE5C;;;;GAIG;AACH,SAAS,IAAI,CAAC,KAAgB;;IAC1B,MAAM,WAAW,GAAG;QAChB,EAAE,EAAE,MAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,EAAE,mCAAI,GAAG;QACjC,EAAE,EAAE,MAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,EAAE,mCAAI,GAAG;QACjC,EAAE,EAAE,MAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,EAAE,mCAAI,GAAG;QACjC,EAAE,EAAE,MAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,EAAE,mCAAI,IAAI;QAClC,EAAE,EAAE,MAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,EAAE,mCAAI,CAAC;KAClC,CAAC;IACF,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC3C,uCACO,KAAK,KACR,KAAK,kCACE,KAAK,CAAC,KAAK,KACd,WAAW,EACX,OAAO,EAAE,KAAK,CAAC,OAAO,OAE5B;IACN,CAAC,CAAC,CAAC;IAEH,OAAO,CACH,KAAC,UAAU,eACE,GAAG,EACZ,SAAS,EAAE,KAAK,CAAC,SAAS,EAC1B,KAAK,kBACD,MAAM,EAAE,KAAK,CAAC,OAAO,IAClB,KAAK,aAGZ,KAAC,UAAU,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,YACnF,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAC3B,KAAC,gBAAgB,IAAC,SAAS,EAAE,KAAK,IAAO,QAAQ,GAAG,IAAI,KAAK,CAAC,GAAG,EAAE,CAAI,CAC1E,CAAC,GACgB,GACb,CAChB,CAAC;AACN,CAAC;AAED,eAAe,IAAI,CAAC"}
+{"version":3,"file":"grid.js","sourceRoot":"","sources":["../../../js/common/grid/grid.tsx"],"names":[],"mappings":";AAAA,OAAO,EAEH,UAAU,EACV,gBAAgB,EAEhB,SAAS,EACT,kBAAkB,GACrB,MAAM,cAAc,CAAC;AACtB,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAc/C,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAA;;;;CAI/B,CAAC;AAEF,MAAM,UAAU,GAAG,SAAS,CAAC,aAAa,CAAC,CAAC;AAE5C;;;;GAIG;AACH,SAAS,IAAI,CAAC,KAAgB;;IAC1B,MAAM,WAAW,GAAG;QAChB,EAAE,EAAE,MAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,EAAE,mCAAI,GAAG;QACjC,EAAE,EAAE,MAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,EAAE,mCAAI,GAAG;QACjC,EAAE,EAAE,MAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,EAAE,mCAAI,GAAG;QACjC,EAAE,EAAE,MAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,EAAE,mCAAI,IAAI;QAClC,EAAE,EAAE,MAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,EAAE,mCAAI,CAAC;KAClC,CAAC;IACF,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC/C,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QAC3C,uCACO,KAAK,KACR,KAAK,kCACE,KAAK,CAAC,KAAK,KACd,WAAW,EACX,OAAO,EAAE,KAAK,CAAC,OAAO,OAE5B;IACN,CAAC,CAAC,CAAC;IAEH,OAAO,CACH,KAAC,UAAU,eACE,GAAG,EACZ,SAAS,EAAE,KAAK,CAAC,SAAS,EAC1B,KAAK,kBACD,UAAU,EAAE,KAAK,CAAC,KAAK,EACvB,cAAc,EAAE,KAAK,CAAC,OAAO,EAC7B,MAAM,EAAE,KAAK,CAAC,OAAO,IAClB,KAAK,aAGZ,KAAC,UAAU,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,EAAE,YACnF,SAAS,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAC3B,KAAC,gBAAgB,IAAC,SAAS,EAAE,KAAK,IAAO,QAAQ,GAAG,IAAI,KAAK,CAAC,GAAG,EAAE,CAAI,CAC1E,CAAC,GACgB,GACb,CAChB,CAAC;AACN,CAAC;AAED,eAAe,IAAI,CAAC"}

package/dist/common/grid/row.d.ts

@@ -1,7 +1,7 @@
-import { ComponentInstance, StyledComponentProps } from '@darajs/core';
+import { ComponentInstance, LayoutComponentProps } from '@darajs/core';
 import { Breakpoints } from '../types';
 import { ColumnProps } from './column';
-interface RowProps extends StyledComponentProps {
+interface RowProps extends LayoutComponentProps {
     /** object containing when each of the five breakpoints should occur */
     breakpoints: Breakpoints;
     /** array of children of Row component */

package/dist/common/grid/row.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"row.d.ts","sourceRoot":"","sources":["../../../js/common/grid/row.tsx"],"names":[],"mappings":"AAIA,OAAO,EACH,iBAAiB,EAGjB,oBAAoB,EAGvB,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAGvC,UAAU,QAAS,SAAQ,oBAAoB;IAC3C,uEAAuE;IACvE,WAAW,EAAE,WAAW,CAAC;IACzB,yCAAyC;IACzC,QAAQ,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IAChC,8BAA8B;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2BAA2B;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AASD,KAAK,cAAc,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;AA2OrD;;;;GAIG;AACH,iBAAS,GAAG,CAAC,KAAK,EAAE,QAAQ,GAAG,GAAG,CAAC,OAAO,CAiDzC;AAED,eAAe,GAAG,CAAC"}
+{"version":3,"file":"row.d.ts","sourceRoot":"","sources":["../../../js/common/grid/row.tsx"],"names":[],"mappings":"AAIA,OAAO,EACH,iBAAiB,EAGjB,oBAAoB,EAGvB,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAGvC,UAAU,QAAS,SAAQ,oBAAoB;IAC3C,uEAAuE;IACvE,WAAW,EAAE,WAAW,CAAC;IACzB,yCAAyC;IACzC,QAAQ,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IAChC,8BAA8B;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,2BAA2B;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB;AASD,KAAK,cAAc,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;AA2OrD;;;;GAIG;AACH,iBAAS,GAAG,CAAC,KAAK,EAAE,QAAQ,GAAG,GAAG,CAAC,OAAO,CAmDzC;AAED,eAAe,GAAG,CAAC"}

package/dist/common/grid/row.js

@@ -231,7 +231,7 @@ function Row(props) {
     const allColumnStyles = useMemo(() => props.children.map((child) => {
         return getColumnStyle(childrenWithOffset, child, props.breakpoints, props.column_gap);
     }), [childrenWithOffset, props.breakpoints, props.column_gap]);
-    return (_jsx(StyledRow, { "$rawCss": css, className: props.className, style: Object.assign({ columnGap: `${props.column_gap}%` }, style), children: _jsx(DisplayCtx.Provider, { value: { component: 'row', direction: 'horizontal' }, children: props.children.map((child, idx) => (_jsx(StyledColumn, { "$rawCss": allColumnStyles[idx], style: { display: 'flex' }, children: _jsx(DynamicComponent, { component: child }) }, `row-${idx}-${child.uid}`))) }) }));
+    return (_jsx(StyledRow, { "$rawCss": css, className: props.className, style: Object.assign({ alignItems: props.align, columnGap: `${props.column_gap}%`, justifyContent: props.justify }, style), children: _jsx(DisplayCtx.Provider, { value: { component: 'row', direction: 'horizontal' }, children: props.children.map((child, idx) => (_jsx(StyledColumn, { "$rawCss": allColumnStyles[idx], style: { display: 'flex' }, children: _jsx(DynamicComponent, { component: child }) }, `row-${idx}-${child.uid}`))) }) }));
 }
 export default Row;
 //# sourceMappingURL=row.js.map

package/dist/common/grid/row.js.map

@@ -1 +1 @@
-{"version":3,"file":"row.js","sourceRoot":"","sources":["../../../js/common/grid/row.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"row.js","sourceRoot":"","sources":["../../../js/common/grid/row.tsx"],"names":[],"mappings":"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"}

package/dist/common/modal/modal.d.ts

@@ -1,5 +1,5 @@
-import { ComponentInstance, StyledComponentProps, Variable } from '@darajs/core';
-interface ModalProps extends StyledComponentProps {
+import { ComponentInstance, LayoutComponentProps, Variable } from '@darajs/core';
+interface ModalProps extends LayoutComponentProps {
     /** The children to be rendered within the modal */
     children: Array<ComponentInstance>;
     /** The show flag, tells the modal whether or not to display */

package/dist/common/modal/modal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modal.d.ts","sourceRoot":"","sources":["../../../js/common/modal/modal.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,iBAAiB,EAEjB,oBAAoB,EACpB,QAAQ,EAIX,MAAM,cAAc,CAAC;AAGtB,UAAU,UAAW,SAAQ,oBAAoB;IAC7C,mDAAmD;IACnD,QAAQ,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACnC,+DAA+D;IAC/D,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;CAC3B;AAID;;;;GAIG;AACH,iBAAS,KAAK,CAAC,KAAK,EAAE,UAAU,GAAG,GAAG,CAAC,OAAO,CAe7C;AAED,eAAe,KAAK,CAAC"}
+{"version":3,"file":"modal.d.ts","sourceRoot":"","sources":["../../../js/common/modal/modal.tsx"],"names":[],"mappings":"AAAA,OAAO,EACH,iBAAiB,EAEjB,oBAAoB,EACpB,QAAQ,EAIX,MAAM,cAAc,CAAC;AAGtB,UAAU,UAAW,SAAQ,oBAAoB;IAC7C,mDAAmD;IACnD,QAAQ,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACnC,+DAA+D;IAC/D,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;CAC3B;AAID;;;;GAIG;AACH,iBAAS,KAAK,CAAC,KAAK,EAAE,UAAU,GAAG,GAAG,CAAC,OAAO,CAoB7C;AAED,eAAe,KAAK,CAAC"}

package/dist/common/modal/modal.js

@@ -13,7 +13,7 @@ function Modal(props) {
     function onAttemptClose() {
         setShow(false);
     }
-    return (_jsx(StyledModal, { "$rawCss": css, onAttemptClose: onAttemptClose, render: show, style: Object.assign({ gap: '0.75rem' }, style), children: props.children.map((child, idx) => (_jsx(DynamicComponent, { component: child }, `modal-${idx}-${child.uid}`))) }));
+    return (_jsx(StyledModal, { "$rawCss": css, onAttemptClose: onAttemptClose, render: show, style: Object.assign({ alignItems: props.align, gap: '0.75rem', justifyContent: props.justify }, style), children: props.children.map((child, idx) => (_jsx(DynamicComponent, { component: child }, `modal-${idx}-${child.uid}`))) }));
 }
 export default Modal;
 //# sourceMappingURL=modal.js.map

package/dist/common/modal/modal.js.map

@@ -1 +1 @@
-{"version":3,"file":"modal.js","sourceRoot":"","sources":["../../../js/common/modal/modal.tsx"],"names":[],"mappings":";AAAA,OAAO,EAEH,gBAAgB,EAGhB,SAAS,EACT,kBAAkB,EAClB,WAAW,GACd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,IAAI,OAAO,EAAE,MAAM,uBAAuB,CAAC;AASzD,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;AAEvC;;;;GAIG;AACH,SAAS,KAAK,CAAC,KAAiB;IAC5B,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACtD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEhD,SAAS,cAAc;QACnB,OAAO,CAAC,KAAK,CAAC,CAAC;IACnB,CAAC;IAED,OAAO,CACH,KAAC,WAAW,eAAU,GAAG,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,kBAAI,GAAG,EAAE,SAAS,IAAK,KAAK,aACrG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAChC,KAAC,gBAAgB,IAAC,SAAS,EAAE,KAAK,IAAO,SAAS,GAAG,IAAI,KAAK,CAAC,GAAG,EAAE,CAAI,CAC3E,CAAC,GACQ,CACjB,CAAC;AACN,CAAC;AAED,eAAe,KAAK,CAAC"}
+{"version":3,"file":"modal.js","sourceRoot":"","sources":["../../../js/common/modal/modal.tsx"],"names":[],"mappings":";AAAA,OAAO,EAEH,gBAAgB,EAGhB,SAAS,EACT,kBAAkB,EAClB,WAAW,GACd,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,IAAI,OAAO,EAAE,MAAM,uBAAuB,CAAC;AASzD,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;AAEvC;;;;GAIG;AACH,SAAS,KAAK,CAAC,KAAiB;IAC5B,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,kBAAkB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACtD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEhD,SAAS,cAAc;QACnB,OAAO,CAAC,KAAK,CAAC,CAAC;IACnB,CAAC;IAED,OAAO,CACH,KAAC,WAAW,eACC,GAAG,EACZ,cAAc,EAAE,cAAc,EAC9B,MAAM,EAAE,IAAI,EACZ,KAAK,kBAAI,UAAU,EAAE,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,CAAC,OAAO,IAAK,KAAK,aAExF,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAChC,KAAC,gBAAgB,IAAC,SAAS,EAAE,KAAK,IAAO,SAAS,GAAG,IAAI,KAAK,CAAC,GAAG,EAAE,CAAI,CAC3E,CAAC,GACQ,CACjB,CAAC;AACN,CAAC;AAED,eAAe,KAAK,CAAC"}

package/dist/common/select/select.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../js/common/select/select.tsx"],"names":[],"mappings":"AAKA,OAAO,EACH,cAAc,EACd,WAAW,EACX,QAAQ,EAKX,MAAM,cAAc,CAAC;AACtB,OAAO,EAEH,IAAI,EAEJ,WAAW,EAId,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE9C,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAWvF;AAiBD,UAAU,WAAY,SAAQ,kBAAkB;IAC5C,0CAA0C;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,uCAAuC;IACvC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;IAC1F,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yCAAyC;IACzC,WAAW,EAAE,OAAO,CAAC;IACrB,+CAA+C;IAC/C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IACpB,mDAAmD;IAEnD,KAAK,CAAC,EAAE,cAAc,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;CAClD;AAID;;;;;;;GAOG;AACH,iBAAS,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG,GAAG,CAAC,OAAO,CA0I/C;AAED,eAAe,MAAM,CAAC"}
+{"version":3,"file":"select.d.ts","sourceRoot":"","sources":["../../../js/common/select/select.tsx"],"names":[],"mappings":"AAKA,OAAO,EACH,cAAc,EACd,WAAW,EACX,QAAQ,EAKX,MAAM,cAAc,CAAC;AACtB,OAAO,EAEH,IAAI,EAEJ,WAAW,EAId,MAAM,uBAAuB,CAAC;AAG/B,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAE9C,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAWvF;AAmBD,UAAU,WAAY,SAAQ,kBAAkB;IAC5C,0CAA0C;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,uCAAuC;IACvC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;IAC1F,6DAA6D;IAC7D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yCAAyC;IACzC,WAAW,EAAE,OAAO,CAAC;IACrB,+CAA+C;IAC/C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,8BAA8B;IAC9B,UAAU,EAAE,OAAO,CAAC;IACpB,mDAAmD;IAEnD,KAAK,CAAC,EAAE,cAAc,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;CAClD;AAID;;;;;;;GAOG;AACH,iBAAS,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG,GAAG,CAAC,OAAO,CA0J/C;AAED,eAAe,MAAM,CAAC"}

package/dist/common/select/select.js

@@ -17,7 +17,6 @@ export function getMultiselectItems(values, items) {
         return acc;
     }, []);
 }
-const toItem = (value) => typeof value === 'string' || typeof value === 'number' ? { label: String(value), value } : value;
 const StyledSelect = injectCss(UiSelect);
 const StyledMultiSelect = injectCss(MultiSelect);
 const StyledComboBox = injectCss(ComboBox);
@@ -28,6 +27,10 @@ function hasListSection(items) {
 function isStringArray(value) {
     return Array.isArray(value) && value.every((item) => typeof item === 'string');
 }
+/** Type guard to check if an object is an Item */
+function isItem(obj) {
+    return obj && Object.prototype.hasOwnProperty.call(obj, 'value');
+}
 // Disabling rules-of-hook as the assumption is that props changing the type of the select won't change
 /* eslint-disable react-hooks/rules-of-hooks */
 /**
@@ -51,6 +54,20 @@ function Select(props) {
         }
         return items;
     }, [items]);
+    /**
+     * Converts a value to an Item, or finds a matching Item in formattedItems based on value.
+     * @param val - The value to be converted or matched.
+     */
+    const toItem = (val) => {
+        // Tries to get matching item based on value from formattedItems
+        const matchingItem = formattedItems.find((item) => isItem(item) && String(item.value) === String(val));
+        // If a matching Item is found return it
+        if (matchingItem) {
+            return matchingItem;
+        }
+        // Otherwise return the item as an Item type with the value as the label, so that select can still show a value even if not present in the list
+        return typeof val === 'string' || typeof val === 'number' ? { label: String(val), val } : val;
+    };
     const [onChangeAction] = useAction(props.onchange);
     //  if someone were to update the component rule of Hooks could be broken if items switched from having sections to not, so we use a ref for this to be only run once
     const itemHasListSection = useRef(null);

package/dist/common/select/select.js.map

@@ -1 +1 @@
-{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../js/common/select/select.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"select.js","sourceRoot":"","sources":["../../../js/common/select/select.tsx"],"names":[],"mappings":"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"}

package/dist/common/stack/stack.d.ts

@@ -1,12 +1,11 @@
 /// <reference types="react" />
-import { ComponentInstance, StyledComponentProps, Variable } from '@darajs/core';
-interface StackProps extends StyledComponentProps {
+import { ComponentInstance, LayoutComponentProps, Variable } from '@darajs/core';
+interface StackProps extends LayoutComponentProps {
     children: Array<ComponentInstance>;
     className: string;
     collapsed: Variable<boolean>;
     direction: 'horizontal' | 'vertical';
     hug?: boolean;
-    justify?: string;
     scroll: boolean;
 }
 declare const _default: import("react").ForwardRefExoticComponent<Omit<StackProps, "ref"> & import("react").RefAttributes<HTMLDivElement>>;

package/dist/common/stack/stack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stack.d.ts","sourceRoot":"","sources":["../../../js/common/stack/stack.tsx"],"names":[],"mappings":";AAGA,OAAO,EACH,iBAAiB,EAGjB,oBAAoB,EACpB,QAAQ,EAIX,MAAM,cAAc,CAAC;AAKtB,UAAU,UAAW,SAAQ,oBAAoB;IAC7C,QAAQ,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC7B,SAAS,EAAE,YAAY,GAAG,UAAU,CAAC;IACrC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;CACnB;;AAiFD,wBAAiC"}
+{"version":3,"file":"stack.d.ts","sourceRoot":"","sources":["../../../js/common/stack/stack.tsx"],"names":[],"mappings":";AAGA,OAAO,EACH,iBAAiB,EAGjB,oBAAoB,EACpB,QAAQ,EAIX,MAAM,cAAc,CAAC;AAKtB,UAAU,UAAW,SAAQ,oBAAoB;IAC7C,QAAQ,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC7B,SAAS,EAAE,YAAY,GAAG,UAAU,CAAC;IACrC,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;CACnB;;AAuED,wBAAiC"}

package/dist/common/stack/stack.js

@@ -3,15 +3,6 @@ import { forwardRef } from 'react';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import { DisplayCtx, DynamicComponent, injectCss, useComponentStyles, useVariable, } from '@darajs/core';
 import styled from '@darajs/styled-components';
-function alignStyle(props) {
-    if (props.align === 'start') {
-        return 'flex-start';
-    }
-    if (props.align === 'end') {
-        return 'flex-end';
-    }
-    return props.align;
-}
 function getCollapseStyles(collapsed) {
     if (collapsed) {
         return {
@@ -33,7 +24,7 @@ function Stack(props, ref) {
     const [collapsed] = useVariable(props.collapsed);
     const [style, css] = useComponentStyles(props);
     const stackContent = (_jsx(DisplayCtx.Provider, { value: { component: 'stack', direction: props.direction }, children: props.children.map((child, idx) => (_jsx(DynamicComponent, { component: child }, `stack-${idx}-${child.uid}`))) }));
-    return (_jsx(StyledStack, { "$rawCss": css, className: props.className, "data-type": "children-wrapper", direction: props.direction, ref: ref, style: Object.assign(Object.assign({ alignItems: alignStyle(props), justifyContent: props.justify }, getCollapseStyles(collapsed)), style), children: props.scroll ? (_jsx(AutoSizer, { children: ({ height, width }) => {
+    return (_jsx(StyledStack, { "$rawCss": css, className: props.className, "data-type": "children-wrapper", direction: props.direction, ref: ref, style: Object.assign(Object.assign({ alignItems: props.align, justifyContent: props.justify }, getCollapseStyles(collapsed)), style), children: props.scroll ? (_jsx(AutoSizer, { children: ({ height, width }) => {
                 var _a;
                 return (_jsx("div", { style: {
                         display: 'flex',

package/dist/common/stack/stack.js.map

@@ -1 +1 @@
-{"version":3,"file":"stack.js","sourceRoot":"","sources":["../../../js/common/stack/stack.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"stack.js","sourceRoot":"","sources":["../../../js/common/stack/stack.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAgB,UAAU,EAAE,MAAM,OAAO,CAAC;AACjD,OAAO,SAAS,MAAM,8BAA8B,CAAC;AAErD,OAAO,EAEH,UAAU,EACV,gBAAgB,EAGhB,SAAS,EACT,kBAAkB,EAClB,WAAW,GACd,MAAM,cAAc,CAAC;AACtB,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAa/C,SAAS,iBAAiB,CAAC,SAAkB;IACzC,IAAI,SAAS,EAAE,CAAC;QACZ,OAAO;YACH,OAAO,EAAE,MAAM;SAClB,CAAC;IACN,CAAC;IACD,OAAO,EAAE,CAAC;AACd,CAAC;AAED,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,CAAC,GAAG,CAAY;;;sBAG9B,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,KAAK,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC;;;aAGzE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,KAAK,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;cACjE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,KAAK,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;CAC/E,CAAC,CAAC;AAEH,SAAS,KAAK,CAAC,KAAiB,EAAE,GAAiC;IAC/D,MAAM,CAAC,SAAS,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACjD,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAE/C,MAAM,YAAY,GAAG,CACjB,KAAC,UAAU,CAAC,QAAQ,IAAC,KAAK,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,YACzE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAChC,KAAC,gBAAgB,IAAC,SAAS,EAAE,KAAK,IAAO,SAAS,GAAG,IAAI,KAAK,CAAC,GAAG,EAAE,CAAI,CAC3E,CAAC,GACgB,CACzB,CAAC;IAEF,OAAO,CACH,KAAC,WAAW,eACC,GAAG,EACZ,SAAS,EAAE,KAAK,CAAC,SAAS,eAChB,kBAAkB,EAC5B,SAAS,EAAE,KAAK,CAAC,SAAS,EAC1B,GAAG,EAAE,GAAG,EACR,KAAK,gCACD,UAAU,EAAE,KAAK,CAAC,KAAK,EACvB,cAAc,EAAE,KAAK,CAAC,OAAO,IAC1B,iBAAiB,CAAC,SAAS,CAAC,GAC5B,KAAK,aAGX,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CACZ,KAAC,SAAS,cACL,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE;;gBAAC,OAAA,CACpB,cACI,KAAK,EAAE;wBACH,OAAO,EAAE,MAAM;wBACf,aAAa,EAAE,KAAK,CAAC,SAAS,KAAK,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ;wBAClE,GAAG,EAAE,MAAA,KAAK,CAAC,GAAG,mCAAI,SAAS;wBAC3B,MAAM;wBACN,QAAQ,EAAE,MAAM;wBAChB,KAAK;qBACR,YAEA,YAAY,GACX,CACT,CAAA;aAAA,GACO,CACf,CAAC,CAAC,CAAC,CACA,YAAY,CACf,GACS,CACjB,CAAC;AACN,CAAC;AAED,eAAe,UAAU,CAAC,KAAK,CAAC,CAAC"}

package/dist/graphs/causal-graph-viewer.d.ts

@@ -31,6 +31,8 @@ export interface CausalGraphViewerProps extends StyledComponentProps {
     on_click_node?: Action;
     /** Action def for any updates to the graph */
     on_update?: Action;
+    /** Optional boolean defining whether a node and an edge can be selected simultaneously */
+    simultaneous_edge_node_selection?: boolean;
     /** Optional parameter to force a tooltip to use a particular font size */
     tooltip_size?: number;
     /** Whether to show verbose descriptions in the editor frame */

package/dist/graphs/causal-graph-viewer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"causal-graph-viewer.d.ts","sourceRoot":"","sources":["../../js/graphs/causal-graph-viewer.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAW,MAAM,OAAO,CAAC;AAEhD,OAAO,EACH,MAAM,EAEN,oBAAoB,EACpB,QAAQ,EAKX,MAAM,cAAc,CAAC;AACtB,OAAO,EACH,WAAW,EACX,UAAU,EACV,iBAAiB,IAAI,mBAAmB,EACxC,cAAc,EACjB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,qBAAqB,EAAyB,MAAM,gBAAgB,CAAC;AAE9E,MAAM,WAAW,sBAAuB,SAAQ,oBAAoB;IAChE,0CAA0C;IAC1C,kBAAkB,CAAC,EAAE,cAAc,CAAC,OAAO,mBAAmB,CAAC,CAAC,mBAAmB,CAAC,CAAC;IACrF,sEAAsE;IACtE,iCAAiC,CAAC,EAAE,OAAO,CAAC;IAC5C,iEAAiE;IACjE,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,+BAA+B;IAC/B,YAAY,EAAE,QAAQ,CAAC,WAAW,CAAC,GAAG,WAAW,CAAC;IAClD,uCAAuC;IACvC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,8CAA8C;IAC9C,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,sCAAsC;IACtC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,oBAAoB;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,wBAAwB;IACxB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,qCAAqC;IACrC,YAAY,EAAE,qBAAqB,CAAC;IACpC,iDAAiD;IACjD,mBAAmB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACpC,sDAAsD;IACtD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qDAAqD;IACrD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,8CAA8C;IAC9C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0EAA0E;IAC1E,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,+DAA+D;IAC/D,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,uEAAuE;IACvE,eAAe,CAAC,EAAE,cAAc,CAAC;CACpC;AAID;;;;;;GAMG;AACH,iBAAS,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,GAAG,CAAC,OAAO,CA4CrE;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"causal-graph-viewer.d.ts","sourceRoot":"","sources":["../../js/graphs/causal-graph-viewer.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAW,MAAM,OAAO,CAAC;AAEhD,OAAO,EACH,MAAM,EAEN,oBAAoB,EACpB,QAAQ,EAKX,MAAM,cAAc,CAAC;AACtB,OAAO,EACH,WAAW,EACX,UAAU,EACV,iBAAiB,IAAI,mBAAmB,EACxC,cAAc,EACjB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,qBAAqB,EAAyB,MAAM,gBAAgB,CAAC;AAE9E,MAAM,WAAW,sBAAuB,SAAQ,oBAAoB;IAChE,0CAA0C;IAC1C,kBAAkB,CAAC,EAAE,cAAc,CAAC,OAAO,mBAAmB,CAAC,CAAC,mBAAmB,CAAC,CAAC;IACrF,sEAAsE;IACtE,iCAAiC,CAAC,EAAE,OAAO,CAAC;IAC5C,iEAAiE;IACjE,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,+BAA+B;IAC/B,YAAY,EAAE,QAAQ,CAAC,WAAW,CAAC,GAAG,WAAW,CAAC;IAClD,uCAAuC;IACvC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,8CAA8C;IAC9C,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,sCAAsC;IACtC,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,oBAAoB;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,wBAAwB;IACxB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,qCAAqC;IACrC,YAAY,EAAE,qBAAqB,CAAC;IACpC,iDAAiD;IACjD,mBAAmB,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IACpC,sDAAsD;IACtD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qDAAqD;IACrD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,8CAA8C;IAC9C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,0FAA0F;IAC1F,gCAAgC,CAAC,EAAE,OAAO,CAAC;IAC3C,0EAA0E;IAC1E,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,+DAA+D;IAC/D,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,uEAAuE;IACvE,eAAe,CAAC,EAAE,cAAc,CAAC;CACpC;AAID;;;;;;GAMG;AACH,iBAAS,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,GAAG,GAAG,CAAC,OAAO,CA6CrE;AAED,eAAe,iBAAiB,CAAC"}

package/dist/graphs/causal-graph-viewer.js

@@ -27,7 +27,7 @@ function CausalGraphViewer(props) {
     if (!props.causal_graph) {
         return null;
     }
-    return (_jsx(StyledGraphViewer, { "$rawCss": css, additionalLegends: props.additional_legends, allowSelectionWhenNotEditable: props.allow_selection_when_not_editable, availableInputs: props.available_inputs, disableEdgeAdd: props.disable_edge_add, disableLatentNodeAdd: props.disable_latent_node_add, disableNodeRemoval: props.disable_node_removal, editable: props.editable, editorMode: props.editor_mode, graphData: graphData, graphLayout: graphLayout, nonRemovableNodes: props.non_removable_nodes, onClickEdge: onClickEdge, onClickNode: onClickNode, onNotify: pushNotification, onUpdate: onGraphUpdate, style: style, tooltipSize: props.tooltip_size, verboseDescriptions: props.verbose_descriptions, zoomThresholds: props.zoom_thresholds }));
+    return (_jsx(StyledGraphViewer, { "$rawCss": css, additionalLegends: props.additional_legends, allowSelectionWhenNotEditable: props.allow_selection_when_not_editable, availableInputs: props.available_inputs, disableEdgeAdd: props.disable_edge_add, disableLatentNodeAdd: props.disable_latent_node_add, disableNodeRemoval: props.disable_node_removal, editable: props.editable, editorMode: props.editor_mode, graphData: graphData, graphLayout: graphLayout, nonRemovableNodes: props.non_removable_nodes, onClickEdge: onClickEdge, onClickNode: onClickNode, onNotify: pushNotification, onUpdate: onGraphUpdate, simultaneousEdgeNodeSelection: props.simultaneous_edge_node_selection, style: style, tooltipSize: props.tooltip_size, verboseDescriptions: props.verbose_descriptions, zoomThresholds: props.zoom_thresholds }));
 }
 export default CausalGraphViewer;
 //# sourceMappingURL=causal-graph-viewer.js.map

package/dist/graphs/causal-graph-viewer.js.map

@@ -1 +1 @@
-{"version":3,"file":"causal-graph-viewer.js","sourceRoot":"","sources":["../../js/graphs/causal-graph-viewer.tsx"],"names":[],"mappings":";AAAA,gDAAgD;AAEhD,OAAO,EAAkB,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhD,OAAO,EAEH,aAAa,EAGb,SAAS,EACT,SAAS,EACT,kBAAkB,EAClB,WAAW,GACd,MAAM,cAAc,CAAC;AACtB,OAAO,EAGH,iBAAiB,IAAI,mBAAmB,GAE3C,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAyB,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAuC9E,MAAM,iBAAiB,GAAG,SAAS,CAAC,mBAAmB,CAAC,CAAC;AAEzD;;;;;;GAMG;AACH,SAAS,iBAAiB,CAAC,KAA6B;IACpD,MAAM,EAAE,gBAAgB,EAAE,GAAG,aAAa,CAAC,gBAAgB,EAAE,CAAC;IAC9D,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAE/C,MAAM,CAAC,SAAS,EAAE,sBAAsB,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC5E,MAAM,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACrD,MAAM,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACrD,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAE9C,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,qBAAqB,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;IAEjF,MAAM,aAAa,GAAG,CAAC,KAAkB,EAAQ,EAAE;QAC/C,sBAAsB,CAAC,KAAK,CAAC,CAAC;QAC9B,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC,CAAC;IAEF,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,CACH,KAAC,iBAAiB,eACL,GAAG,EACZ,iBAAiB,EAAE,KAAK,CAAC,kBAAkB,EAC3C,6BAA6B,EAAE,KAAK,CAAC,iCAAiC,EACtE,eAAe,EAAE,KAAK,CAAC,gBAAgB,EACvC,cAAc,EAAE,KAAK,CAAC,gBAAgB,EACtC,oBAAoB,EAAE,KAAK,CAAC,uBAAuB,EACnD,kBAAkB,EAAE,KAAK,CAAC,oBAAoB,EAC9C,QAAQ,EAAE,KAAK,CAAC,QAAQ,EACxB,UAAU,EAAE,KAAK,CAAC,WAAW,EAC7B,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,KAAK,CAAC,mBAAmB,EAC5C,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,EAAE,aAAa,EACvB,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,KAAK,CAAC,YAAY,EAC/B,mBAAmB,EAAE,KAAK,CAAC,oBAAoB,EAC/C,cAAc,EAAE,KAAK,CAAC,eAAe,GACvC,CACL,CAAC;AACN,CAAC;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"causal-graph-viewer.js","sourceRoot":"","sources":["../../js/graphs/causal-graph-viewer.tsx"],"names":[],"mappings":";AAAA,gDAAgD;AAEhD,OAAO,EAAkB,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhD,OAAO,EAEH,aAAa,EAGb,SAAS,EACT,SAAS,EACT,kBAAkB,EAClB,WAAW,GACd,MAAM,cAAc,CAAC;AACtB,OAAO,EAGH,iBAAiB,IAAI,mBAAmB,GAE3C,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAyB,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAyC9E,MAAM,iBAAiB,GAAG,SAAS,CAAC,mBAAmB,CAAC,CAAC;AAEzD;;;;;;GAMG;AACH,SAAS,iBAAiB,CAAC,KAA6B;IACpD,MAAM,EAAE,gBAAgB,EAAE,GAAG,aAAa,CAAC,gBAAgB,EAAE,CAAC;IAC9D,MAAM,CAAC,KAAK,EAAE,GAAG,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAE/C,MAAM,CAAC,SAAS,EAAE,sBAAsB,CAAC,GAAG,WAAW,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC5E,MAAM,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACrD,MAAM,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACrD,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAE9C,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,qBAAqB,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;IAEjF,MAAM,aAAa,GAAG,CAAC,KAAkB,EAAQ,EAAE;QAC/C,sBAAsB,CAAC,KAAK,CAAC,CAAC;QAC9B,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC,CAAC;IAEF,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,CACH,KAAC,iBAAiB,eACL,GAAG,EACZ,iBAAiB,EAAE,KAAK,CAAC,kBAAkB,EAC3C,6BAA6B,EAAE,KAAK,CAAC,iCAAiC,EACtE,eAAe,EAAE,KAAK,CAAC,gBAAgB,EACvC,cAAc,EAAE,KAAK,CAAC,gBAAgB,EACtC,oBAAoB,EAAE,KAAK,CAAC,uBAAuB,EACnD,kBAAkB,EAAE,KAAK,CAAC,oBAAoB,EAC9C,QAAQ,EAAE,KAAK,CAAC,QAAQ,EACxB,UAAU,EAAE,KAAK,CAAC,WAAW,EAC7B,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,KAAK,CAAC,mBAAmB,EAC5C,WAAW,EAAE,WAAW,EACxB,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,gBAAgB,EAC1B,QAAQ,EAAE,aAAa,EACvB,6BAA6B,EAAE,KAAK,CAAC,gCAAgC,EACrE,KAAK,EAAE,KAAK,EACZ,WAAW,EAAE,KAAK,CAAC,YAAY,EAC/B,mBAAmB,EAAE,KAAK,CAAC,oBAAoB,EAC/C,cAAc,EAAE,KAAK,CAAC,eAAe,GACvC,CACL,CAAC;AACN,CAAC;AAED,eAAe,iBAAiB,CAAC"}

package/dist/graphs/graph-layout.d.ts

@@ -1,5 +1,8 @@
-import { GraphLayout, MarketingLayout, PlanarLayout } from '@darajs/ui-causal-graph-editor';
+import { GraphLayout, MarketingLayout, PlanarLayout, TieredGraphLayoutBuilder } from '@darajs/ui-causal-graph-editor';
 type GraphLayoutType = 'marketing' | 'planar' | 'spring' | 'circular' | 'fcose' | 'force_atlas' | 'custom';
+interface DefinitionWithTiers extends TieredGraphLayoutBuilder {
+    tier_separation?: number;
+}
 interface BaseGraphLayoutDefinition {
     layout_type: GraphLayoutType;
     node_font_size?: number;
@@ -11,7 +14,7 @@ interface CircularLayoutDefinition extends BaseGraphLayoutDefinition {
 interface CustomLayoutDefinition extends BaseGraphLayoutDefinition {
     layout_type: 'custom';
 }
-interface FcoseLayoutDefinition extends BaseGraphLayoutDefinition {
+interface FcoseLayoutDefinition extends BaseGraphLayoutDefinition, DefinitionWithTiers {
     edge_elasticity?: number;
     edge_length?: number;
     energy?: number;
@@ -34,15 +37,16 @@ interface ForceAtlasLayoutDefinition extends BaseGraphLayoutDefinition {
     scaling_ratio?: number;
     strong_gravity_mode?: boolean;
 }
-interface MarketingLayoutDefinition extends BaseGraphLayoutDefinition {
+interface MarketingLayoutDefinition extends BaseGraphLayoutDefinition, DefinitionWithTiers {
     layout_type: 'marketing';
     target_location?: MarketingLayout['targetLocation'];
 }
-interface PlanarLayoutDefinition extends BaseGraphLayoutDefinition {
+interface PlanarLayoutDefinition extends BaseGraphLayoutDefinition, TieredGraphLayoutBuilder {
+    layering_algorithm?: PlanarLayout['layeringAlgorithm'];
     layout_type: 'planar';
     orientation?: PlanarLayout['orientation'];
 }
-interface SpringLayoutDefinition extends BaseGraphLayoutDefinition {
+interface SpringLayoutDefinition extends BaseGraphLayoutDefinition, DefinitionWithTiers {
     collision_force?: number;
     gravity?: number;
     layout_type: 'spring';

package/dist/graphs/graph-layout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph-layout.d.ts","sourceRoot":"","sources":["../../js/graphs/graph-layout.tsx"],"names":[],"mappings":"AAAA,OAAO,EAKH,WAAW,EACX,eAAe,EACf,YAAY,EAEf,MAAM,gCAAgC,CAAC;AAGxC,KAAK,eAAe,GAAG,WAAW,GAAG,QAAQ,GAAG,QAAQ,GAAG,UAAU,GAAG,OAAO,GAAG,aAAa,GAAG,QAAQ,CAAC;AAE3G,UAAU,yBAAyB;IAC/B,WAAW,EAAE,eAAe,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,UAAU,wBAAyB,SAAQ,yBAAyB;IAChE,WAAW,EAAE,UAAU,CAAC;CAC3B;AAED,UAAU,sBAAuB,SAAQ,yBAAyB;IAC9D,WAAW,EAAE,QAAQ,CAAC;CACzB;AAED,UAAU,qBAAsB,SAAQ,yBAAyB;IAC7D,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,UAAU,0BAA2B,SAAQ,yBAAyB;IAClE,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,aAAa,CAAC;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gCAAgC,CAAC,EAAE,OAAO,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,UAAU,yBAA0B,SAAQ,yBAAyB;IACjE,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,CAAC,EAAE,eAAe,CAAC,gBAAgB,CAAC,CAAC;CACvD;AAED,UAAU,sBAAuB,SAAQ,yBAAyB;IAC9D,WAAW,EAAE,QAAQ,CAAC;IACtB,WAAW,CAAC,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;CAC7C;AAED,UAAU,sBAAuB,SAAQ,yBAAyB;IAC9D,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,QAAQ,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,MAAM,qBAAqB,GAC3B,wBAAwB,GACxB,sBAAsB,GACtB,qBAAqB,GACrB,0BAA0B,GAC1B,yBAAyB,GACzB,sBAAsB,GACtB,sBAAsB,CAAC;AAE7B;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,qBAAqB,GAAG,WAAW,CA4IpF"}
+{"version":3,"file":"graph-layout.d.ts","sourceRoot":"","sources":["../../js/graphs/graph-layout.tsx"],"names":[],"mappings":"AAAA,OAAO,EAKH,WAAW,EACX,eAAe,EACf,YAAY,EAEZ,wBAAwB,EAC3B,MAAM,gCAAgC,CAAC;AAIxC,KAAK,eAAe,GAAG,WAAW,GAAG,QAAQ,GAAG,QAAQ,GAAG,UAAU,GAAG,OAAO,GAAG,aAAa,GAAG,QAAQ,CAAC;AAE3G,UAAU,mBAAoB,SAAQ,wBAAwB;IAC1D,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAKD,UAAU,yBAAyB;IAC/B,WAAW,EAAE,eAAe,CAAC;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,UAAU,wBAAyB,SAAQ,yBAAyB;IAChE,WAAW,EAAE,UAAU,CAAC;CAC3B;AAED,UAAU,sBAAuB,SAAQ,yBAAyB;IAC9D,WAAW,EAAE,QAAQ,CAAC;CACzB;AAED,UAAU,qBAAsB,SAAQ,yBAAyB,EAAE,mBAAmB;IAClF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,UAAU,0BAA2B,SAAQ,yBAAyB;IAClE,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,aAAa,CAAC;IAC3B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,gCAAgC,CAAC,EAAE,OAAO,CAAC;IAC3C,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,UAAU,yBAA0B,SAAQ,yBAAyB,EAAE,mBAAmB;IACtF,WAAW,EAAE,WAAW,CAAC;IACzB,eAAe,CAAC,EAAE,eAAe,CAAC,gBAAgB,CAAC,CAAC;CACvD;AAED,UAAU,sBAAuB,SAAQ,yBAAyB,EAAE,wBAAwB;IACxF,kBAAkB,CAAC,EAAE,YAAY,CAAC,mBAAmB,CAAC,CAAC;IACvD,WAAW,EAAE,QAAQ,CAAC;IACtB,WAAW,CAAC,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;CAC7C;AAED,UAAU,sBAAuB,SAAQ,yBAAyB,EAAE,mBAAmB;IACnF,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,EAAE,QAAQ,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,MAAM,qBAAqB,GAC3B,wBAAwB,GACxB,sBAAsB,GACtB,qBAAqB,GACrB,0BAA0B,GAC1B,yBAAyB,GACzB,sBAAsB,GACtB,sBAAsB,CAAC;AAM7B;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,qBAAqB,GAAG,WAAW,CAmKpF"}

package/dist/graphs/graph-layout.js

@@ -1,4 +1,7 @@
 import { CircularLayout, CustomLayout, FcoseLayout, ForceAtlasLayout, MarketingLayout, PlanarLayout, SpringLayout, } from '@darajs/ui-causal-graph-editor';
+function isDefinitionWithTiers(obj) {
+    return obj && typeof obj === 'object' && 'tiers' in obj;
+}
 /**
  * Parse a backend graph layout definition into a graph layout understood by the UI component
  *
@@ -86,6 +89,12 @@ export function parseLayoutDefinition(definition) {
             if (definition.orientation) {
                 builder.orientation(definition.orientation);
             }
+            if (definition.tiers) {
+                builder.tiers(definition.tiers);
+            }
+            if (definition.layering_algorithm) {
+                builder.layeringAlgorithm(definition.layering_algorithm);
+            }
             break;
         }
         case 'spring': {
@@ -99,6 +108,18 @@ export function parseLayoutDefinition(definition) {
             throw new Error(`Unrecognised layout type: ${String(definition.layout_type)}`);
         }
     }
+    if (isDefinitionWithTiers(definition)) {
+        const builderWithTiers = builder;
+        if (definition.tiers) {
+            builderWithTiers.tiers = definition.tiers;
+        }
+        if (definition.orientation) {
+            builderWithTiers.orientation = definition.orientation;
+        }
+        if (definition.tier_separation) {
+            builderWithTiers.tierSeparation(definition.tier_separation);
+        }
+    }
     if (definition.node_size) {
         builder.nodeSize(definition.node_size);
     }

package/dist/graphs/graph-layout.js.map

@@ -1 +1 @@
-{"version":3,"file":"graph-layout.js","sourceRoot":"","sources":["../../js/graphs/graph-layout.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"graph-layout.js","sourceRoot":"","sources":["../../js/graphs/graph-layout.tsx"],"names":[],"mappings":"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"}

package/dist/plotting/bokeh/bokeh.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bokeh.d.ts","sourceRoot":"","sources":["../../../js/plotting/bokeh/bokeh.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,QAAQ,MAAM,6BAA6B,CAAC;AAI7D,OAAO,EAAE,MAAM,EAAmB,oBAAoB,EAA4C,MAAM,cAAc,CAAC;AAiBvH,UAAU,UAAW,SAAQ,oBAAoB;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;CAC/B;AAID,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ;;WAEG;QACH,KAAK,EAAE,OAAO,QAAQ,CAAC;QACvB;;;WAGG;QACH,YAAY,CAAC,EAAE,OAAO,CAAC;KAC1B;CACJ;AAGD;;;;;GAKG;AACH,iBAAS,KAAK,CAAC,KAAK,EAAE,UAAU,GAAG,GAAG,CAAC,OAAO,CA+G7C;AAED,eAAe,KAAK,CAAC"}
+{"version":3,"file":"bokeh.d.ts","sourceRoot":"","sources":["../../../js/plotting/bokeh/bokeh.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,KAAK,QAAQ,MAAM,6BAA6B,CAAC;AAI7D,OAAO,EAAE,MAAM,EAAmB,oBAAoB,EAA4C,MAAM,cAAc,CAAC;AAiBvH,UAAU,UAAW,SAAQ,oBAAoB;IAC7C,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;CAC/B;AAID,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,MAAM;QACZ;;WAEG;QACH,KAAK,EAAE,OAAO,QAAQ,CAAC;QACvB;;;WAGG;QACH,YAAY,CAAC,EAAE,OAAO,CAAC;KAC1B;CACJ;AAGD;;;;;GAKG;AACH,iBAAS,KAAK,CAAC,KAAK,EAAE,UAAU,GAAG,GAAG,CAAC,OAAO,CAoH7C;AAED,eAAe,KAAK,CAAC"}