diff --git a/package.json b/package.json index 7a66e88824..b6aa0e8e1f 100644 --- a/package.json +++ b/package.json @@ -5,12 +5,11 @@ "eslint": "^6.8.0", "eslint-plugin-prettier": "^3.1.2", "eslint-plugin-svelte3": "^2.7.3", - "lerna": "^3.14.1", + "lerna": "3.14.1", "prettier": "^1.19.1", "prettier-plugin-svelte": "^0.7.0", "svelte": "^3.18.1" }, - "dependencies": {}, "scripts": { "bootstrap": "lerna bootstrap", "build": "lerna run build", diff --git a/packages/bootstrap-components/dist/generators.js b/packages/bootstrap-components/dist/generators.js deleted file mode 100644 index c5edf509a7..0000000000 --- a/packages/bootstrap-components/dist/generators.js +++ /dev/null @@ -1,445 +0,0 @@ -const buttons = () => [ - { - name: "common/Primary Button", - description: "Bootstrap primary button ", - inherits: "@budibase/standard-components/button", - props: { - className: "btn btn-primary", - }, - }, - { - name: "common/Default Button", - description: "Bootstrap default button", - inherits: "@budibase/standard-components/button", - props: { - className: "btn btn-secondary", - }, - }, -]; - -const forms = ({ records, indexes, helpers }) => [ - ...records.map(root), - ...buttons(), -]; - -const formName = record => `${record.name}/${record.name} Form`; - -const root = record => ({ - name: formName(record), - description: `Control for creating/updating '${record.nodeKey()}' `, - inherits: "@budibase/standard-components/container", - props: { - className: "p-1", - children: [ - { - component: { - _component: "@budibase/standard-components/h3", - text: `Edit ${record.name}`, - }, - }, - form(record), - saveCancelButtons(record), - ], - }, -}); - -const form = record => ({ - component: { - _component: "@budibase/standard-components/form", - formControls: record.fields.map(f => formControl(record, f)), - }, -}); - -const formControl = (record, field) => { - if ( - field.type === "string" && - field.typeOptions.values && - field.typeOptions.values.length > 0 - ) { - return { - control: { - _component: "@budibase/standard-components/select", - options: field.typeOptions.values.map(v => ({ id: v, value: v })), - value: { - "##bbstate": `${record.name}.${field.name}`, - "##bbsource": "store", - }, - className: "form-control", - }, - label: field.label, - } - } else { - return { - control: { - _component: "@budibase/standard-components/input", - value: { - "##bbstate": `${record.name}.${field.name}`, - "##bbsource": "store", - }, - className: "form-control", - type: - field.type === "string" - ? "text" - : field.type === "datetime" - ? "date" - : field.type === "number" - ? "number" - : "text", - }, - label: field.label, - } - } -}; - -const saveCancelButtons = record => ({ - component: { - _component: "@budibase/standard-components/stackpanel", - direction: "horizontal", - children: [ - paddedPanelForButton({ - _component: "common/Primary Button", - contentText: `Save ${record.name}`, - onClick: [ - { - "##eventHandlerType": "Save Record", - parameters: { - statePath: `${record.name}`, - }, - }, - { - "##eventHandlerType": "Set State", - parameters: { - path: `isEditing${record.name}`, - value: "", - }, - }, - ], - }), - paddedPanelForButton({ - _component: "common/Default Button", - contentText: `Cancel`, - onClick: [ - { - "##eventHandlerType": "Set State", - parameters: { - path: `isEditing${record.name}`, - value: "", - }, - }, - ], - }), - ], - }, -}); - -const paddedPanelForButton = button => ({ - control: { - _component: "@budibase/standard-components/container", - className: "btn-group", - children: [ - { - component: button, - }, - ], - }, -}); - -const getRecordPath = () => { - const parts = []; - - return parts.reverse().join("/") -}; - -const indexTables = ({ indexes, helpers }) => - indexes.map(i => indexTable(i, helpers)); - -const excludedColumns = ["id", "isNew", "key", "type", "sortKey"]; - -const indexTableProps = (index, helpers) => ({ - data: { - "##bbstate": index.nodeKey(), - "##bbsource": "store", - }, - tableClass: "table table-hover", - theadClass: "thead-dark", - columns: helpers - .indexSchema(index) - .filter(c => !excludedColumns.includes(c.name)) - .map(column), - onRowClick: [ - { - "##eventHandlerType": "Set State", - parameters: { - path: `selectedrow_${index.name}`, - value: { - "##bbstate": "key", - "##bbsource": "event", - }, - }, - }, - ], -}); - -const getIndexTableName = (index, record) => { - record = record || index.parent().type === "record" ? index.parent() : null; - - return record - ? `${getRecordPath()}/${index.name} Table` - : `${index.name} Table` -}; - -const indexTable = (index, helpers) => ({ - name: getIndexTableName(index), - inherits: "@budibase/standard-components/table", - props: indexTableProps(index, helpers), -}); - -const column = col => ({ - title: col.name, - value: { - "##bbstate": col.name, - "##bbsource": "context", - }, -}); - -const recordHomePageComponents = ({ indexes, records, helpers }) => [ - ...recordHomepages({ indexes, records }).map(component), - - ...recordHomepages({ indexes, records }).map(homePageButtons), - - ...indexTables({ indexes, records, helpers }), - - ...buttons(), -]; - -const findIndexForRecord = (indexes, record) => { - const forRecord = indexes.filter(i => - i.allowedRecordNodeIds.includes(record.nodeId) - ); - if (forRecord.length === 0) return - if (forRecord.length === 1) return forRecord[0] - const noMap = forRecord.filter(i => !i.filter || !i.filter.trim()); - if (noMap.length === 0) forRecord[0]; - return noMap[0] -}; - -const recordHomepages = ({ indexes, records }) => - records - .filter(r => r.parent().type === "root") - .map(r => ({ - record: r, - index: findIndexForRecord(indexes, r), - })) - .filter(r => r.index); - -const homepageComponentName = record => - `${record.name}/${record.name} homepage`; - -const component = ({ record, index }) => ({ - inherits: "@budibase/standard-components/container", - name: homepageComponentName(record), - props: { - className: "d-flex flex-column h-100", - children: [ - { - component: { - _component: `${record.name}/homepage buttons`, - }, - }, - { - component: { - _component: getIndexTableName(index), - }, - className: "flex-gow-1 overflow-auto", - }, - ], - onLoad: [ - { - "##eventHandlerType": "Set State", - parameters: { - path: `isEditing${record.name}`, - value: "", - }, - }, - { - "##eventHandlerType": "List Records", - parameters: { - statePath: index.nodeKey(), - indexKey: index.nodeKey(), - }, - }, - ], - }, -}); - -const homePageButtons = ({ index, record }) => ({ - inherits: "@budibase/standard-components/container", - name: `${record.name}/homepage buttons`, - props: { - className: "btn-toolbar mt-4 mb-2", - children: [ - { - component: { - _component: "@budibase/standard-components/container", - className: "btn-group mr-3", - children: [ - { - component: { - _component: "common/Default Button", - contentText: `Create ${record.name}`, - onClick: [ - { - "##eventHandlerType": "Get New Record", - parameters: { - statePath: record.name, - collectionKey: `/${record.collectionName}`, - childRecordType: record.name, - }, - }, - { - "##eventHandlerType": "Set State", - parameters: { - path: `isEditing${record.name}`, - value: "true", - }, - }, - ], - }, - }, - { - component: { - _component: "common/Default Button", - contentText: `Refresh`, - onClick: [ - { - "##eventHandlerType": "List Records", - parameters: { - statePath: index.nodeKey(), - indexKey: index.nodeKey(), - }, - }, - ], - }, - }, - ], - }, - }, - { - component: { - _component: "@budibase/standard-components/if", - condition: `$store.selectedrow_${index.name} && $store.selectedrow_${index.name}.length > 0`, - thenComponent: { - _component: "@budibase/standard-components/container", - className: "btn-group", - children: [ - { - component: { - _component: "common/Default Button", - contentText: `Edit ${record.name}`, - onClick: [ - { - "##eventHandlerType": "Load Record", - parameters: { - statePath: record.name, - recordKey: { - "##bbstate": `selectedrow_${index.name}`, - "##source": "store", - }, - }, - }, - { - "##eventHandlerType": "Set State", - parameters: { - path: `isEditing${record.name}`, - value: "true", - }, - }, - ], - }, - }, - { - component: { - _component: "common/Default Button", - contentText: `Delete ${record.name}`, - onClick: [ - { - "##eventHandlerType": "Delete Record", - parameters: { - recordKey: { - "##bbstate": `selectedrow_${index.name}`, - "##source": "store", - }, - }, - }, - ], - }, - }, - ], - }, - }, - }, - ], - }, -}); - -const selectNavContent = ({ indexes, records, helpers }) => [ - ...recordHomepages({ indexes, records }).map(component$1), - - ...recordHomePageComponents({ indexes, records, helpers }), - - ...forms({ indexes, records, helpers }), -]; - -const navContentComponentName = record => - `${record.name}/${record.name} Nav Content`; - -const component$1 = ({ record }) => ({ - inherits: "@budibase/standard-components/if", - description: `the component that gets displayed when the ${record.collectionName} nav is selected`, - name: navContentComponentName(record), - props: { - condition: `$store.isEditing${record.name}`, - thenComponent: { - _component: formName(record), - }, - elseComponent: { - _component: homepageComponentName(record), - }, - }, -}); - -const app = ({ records, indexes, helpers }) => [ - { - name: "Application Root", - inherits: "@budibase/bootstrap-components/nav", - props: { - items: recordHomepages({ indexes, records }).map(navItem), - orientation: "horizontal", - alignment: "start", - fill: false, - pills: true, - selectedItem: { - "##bbstate": "selectedNav", - "##bbstatefallback": `${records[0].name}`, - "##bbsource": "store", - }, - className: "p-3", - }, - }, - { - name: "Login", - inherits: "@budibase/standard-components/login", - props: {}, - }, - ...selectNavContent({ records, indexes, helpers }), -]; - -const navItem = ({ record }) => ({ - title: record.collectionName, - component: { - _component: navContentComponentName(record), - }, -}); - -export { app, forms, indexTables, recordHomePageComponents as recordHomepages }; -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"generators.js","sources":["../src/generators/buttonGenerators.js","../src/generators/formsGenerator.js","../src/generators/getRecordPath.js","../src/generators/indexTablesGenerator.js","../src/generators/recordHomePageGenerator.js","../src/generators/selectedNavContentGenerator.js","../src/generators/appGenerator.js"],"sourcesContent":["export const buttons = () => [\n  {\n    name: \"common/Primary Button\",\n    description: \"Bootstrap primary button \",\n    inherits: \"@budibase/standard-components/button\",\n    props: {\n      className: \"btn btn-primary\",\n    },\n  },\n  {\n    name: \"common/Default Button\",\n    description: \"Bootstrap default button\",\n    inherits: \"@budibase/standard-components/button\",\n    props: {\n      className: \"btn btn-secondary\",\n    },\n  },\n]\n","import { buttons } from \"./buttonGenerators\"\n\nexport const forms = ({ records, indexes, helpers }) => [\n  ...records.map(root),\n  ...buttons({ records, indexes, helpers }),\n]\n\nexport const formName = record => `${record.name}/${record.name} Form`\n\nconst root = record => ({\n  name: formName(record),\n  description: `Control for creating/updating '${record.nodeKey()}' `,\n  inherits: \"@budibase/standard-components/container\",\n  props: {\n    className: \"p-1\",\n    children: [\n      {\n        component: {\n          _component: \"@budibase/standard-components/h3\",\n          text: `Edit ${record.name}`,\n        },\n      },\n      form(record),\n      saveCancelButtons(record),\n    ],\n  },\n})\n\nconst form = record => ({\n  component: {\n    _component: \"@budibase/standard-components/form\",\n    formControls: record.fields.map(f => formControl(record, f)),\n  },\n})\n\nconst formControl = (record, field) => {\n  if (\n    field.type === \"string\" &&\n    field.typeOptions.values &&\n    field.typeOptions.values.length > 0\n  ) {\n    return {\n      control: {\n        _component: \"@budibase/standard-components/select\",\n        options: field.typeOptions.values.map(v => ({ id: v, value: v })),\n        value: {\n          \"##bbstate\": `${record.name}.${field.name}`,\n          \"##bbsource\": \"store\",\n        },\n        className: \"form-control\",\n      },\n      label: field.label,\n    }\n  } else {\n    return {\n      control: {\n        _component: \"@budibase/standard-components/input\",\n        value: {\n          \"##bbstate\": `${record.name}.${field.name}`,\n          \"##bbsource\": \"store\",\n        },\n        className: \"form-control\",\n        type:\n          field.type === \"string\"\n            ? \"text\"\n            : field.type === \"datetime\"\n            ? \"date\"\n            : field.type === \"number\"\n            ? \"number\"\n            : \"text\",\n      },\n      label: field.label,\n    }\n  }\n}\n\nconst saveCancelButtons = record => ({\n  component: {\n    _component: \"@budibase/standard-components/stackpanel\",\n    direction: \"horizontal\",\n    children: [\n      paddedPanelForButton({\n        _component: \"common/Primary Button\",\n        contentText: `Save ${record.name}`,\n        onClick: [\n          {\n            \"##eventHandlerType\": \"Save Record\",\n            parameters: {\n              statePath: `${record.name}`,\n            },\n          },\n          {\n            \"##eventHandlerType\": \"Set State\",\n            parameters: {\n              path: `isEditing${record.name}`,\n              value: \"\",\n            },\n          },\n        ],\n      }),\n      paddedPanelForButton({\n        _component: \"common/Default Button\",\n        contentText: `Cancel`,\n        onClick: [\n          {\n            \"##eventHandlerType\": \"Set State\",\n            parameters: {\n              path: `isEditing${record.name}`,\n              value: \"\",\n            },\n          },\n        ],\n      }),\n    ],\n  },\n})\n\nconst paddedPanelForButton = button => ({\n  control: {\n    _component: \"@budibase/standard-components/container\",\n    className: \"btn-group\",\n    children: [\n      {\n        component: button,\n      },\n    ],\n  },\n})\n","export const getRecordPath = () => {\n  const parts = []\n\n  const add = current => {\n    parts.push(current.name)\n    if (current.parent().type === \"root\") {\n      return\n    }\n\n    add(current.parent())\n  }\n\n  return parts.reverse().join(\"/\")\n}\n","import { getRecordPath } from \"./getRecordPath\"\n\nexport const indexTables = ({ indexes, helpers }) =>\n  indexes.map(i => indexTable(i, helpers))\n\nconst excludedColumns = [\"id\", \"isNew\", \"key\", \"type\", \"sortKey\"]\n\nexport const indexTableProps = (index, helpers) => ({\n  data: {\n    \"##bbstate\": index.nodeKey(),\n    \"##bbsource\": \"store\",\n  },\n  tableClass: \"table table-hover\",\n  theadClass: \"thead-dark\",\n  columns: helpers\n    .indexSchema(index)\n    .filter(c => !excludedColumns.includes(c.name))\n    .map(column),\n  onRowClick: [\n    {\n      \"##eventHandlerType\": \"Set State\",\n      parameters: {\n        path: `selectedrow_${index.name}`,\n        value: {\n          \"##bbstate\": \"key\",\n          \"##bbsource\": \"event\",\n        },\n      },\n    },\n  ],\n})\n\nexport const getIndexTableName = (index, record) => {\n  record = record || index.parent().type === \"record\" ? index.parent() : null\n\n  return record\n    ? `${getRecordPath(record)}/${index.name} Table`\n    : `${index.name} Table`\n}\n\nconst indexTable = (index, helpers) => ({\n  name: getIndexTableName(index),\n  inherits: \"@budibase/standard-components/table\",\n  props: indexTableProps(index, helpers),\n})\n\nconst column = col => ({\n  title: col.name,\n  value: {\n    \"##bbstate\": col.name,\n    \"##bbsource\": \"context\",\n  },\n})\n","import { getIndexTableName, indexTables } from \"./indexTablesGenerator\"\n\nimport { buttons } from \"./buttonGenerators\"\n\nexport const recordHomePageComponents = ({ indexes, records, helpers }) => [\n  ...recordHomepages({ indexes, records }).map(component),\n\n  ...recordHomepages({ indexes, records }).map(homePageButtons),\n\n  ...indexTables({ indexes, records, helpers }),\n\n  ...buttons({ indexes, buttons, helpers }),\n]\n\nconst findIndexForRecord = (indexes, record) => {\n  const forRecord = indexes.filter(i =>\n    i.allowedRecordNodeIds.includes(record.nodeId)\n  )\n  if (forRecord.length === 0) return\n  if (forRecord.length === 1) return forRecord[0]\n  const noMap = forRecord.filter(i => !i.filter || !i.filter.trim())\n  if (noMap.length === 0) forRecord[0]\n  return noMap[0]\n}\n\nexport const recordHomepages = ({ indexes, records }) =>\n  records\n    .filter(r => r.parent().type === \"root\")\n    .map(r => ({\n      record: r,\n      index: findIndexForRecord(indexes, r),\n    }))\n    .filter(r => r.index)\n\nexport const homepageComponentName = record =>\n  `${record.name}/${record.name} homepage`\n\nconst component = ({ record, index }) => ({\n  inherits: \"@budibase/standard-components/container\",\n  name: homepageComponentName(record),\n  props: {\n    className: \"d-flex flex-column h-100\",\n    children: [\n      {\n        component: {\n          _component: `${record.name}/homepage buttons`,\n        },\n      },\n      {\n        component: {\n          _component: getIndexTableName(index),\n        },\n        className: \"flex-gow-1 overflow-auto\",\n      },\n    ],\n    onLoad: [\n      {\n        \"##eventHandlerType\": \"Set State\",\n        parameters: {\n          path: `isEditing${record.name}`,\n          value: \"\",\n        },\n      },\n      {\n        \"##eventHandlerType\": \"List Records\",\n        parameters: {\n          statePath: index.nodeKey(),\n          indexKey: index.nodeKey(),\n        },\n      },\n    ],\n  },\n})\n\nconst homePageButtons = ({ index, record }) => ({\n  inherits: \"@budibase/standard-components/container\",\n  name: `${record.name}/homepage buttons`,\n  props: {\n    className: \"btn-toolbar mt-4 mb-2\",\n    children: [\n      {\n        component: {\n          _component: \"@budibase/standard-components/container\",\n          className: \"btn-group mr-3\",\n          children: [\n            {\n              component: {\n                _component: \"common/Default Button\",\n                contentText: `Create ${record.name}`,\n                onClick: [\n                  {\n                    \"##eventHandlerType\": \"Get New Record\",\n                    parameters: {\n                      statePath: record.name,\n                      collectionKey: `/${record.collectionName}`,\n                      childRecordType: record.name,\n                    },\n                  },\n                  {\n                    \"##eventHandlerType\": \"Set State\",\n                    parameters: {\n                      path: `isEditing${record.name}`,\n                      value: \"true\",\n                    },\n                  },\n                ],\n              },\n            },\n            {\n              component: {\n                _component: \"common/Default Button\",\n                contentText: `Refresh`,\n                onClick: [\n                  {\n                    \"##eventHandlerType\": \"List Records\",\n                    parameters: {\n                      statePath: index.nodeKey(),\n                      indexKey: index.nodeKey(),\n                    },\n                  },\n                ],\n              },\n            },\n          ],\n        },\n      },\n      {\n        component: {\n          _component: \"@budibase/standard-components/if\",\n          condition: `$store.selectedrow_${index.name} && $store.selectedrow_${index.name}.length > 0`,\n          thenComponent: {\n            _component: \"@budibase/standard-components/container\",\n            className: \"btn-group\",\n            children: [\n              {\n                component: {\n                  _component: \"common/Default Button\",\n                  contentText: `Edit ${record.name}`,\n                  onClick: [\n                    {\n                      \"##eventHandlerType\": \"Load Record\",\n                      parameters: {\n                        statePath: record.name,\n                        recordKey: {\n                          \"##bbstate\": `selectedrow_${index.name}`,\n                          \"##source\": \"store\",\n                        },\n                      },\n                    },\n                    {\n                      \"##eventHandlerType\": \"Set State\",\n                      parameters: {\n                        path: `isEditing${record.name}`,\n                        value: \"true\",\n                      },\n                    },\n                  ],\n                },\n              },\n              {\n                component: {\n                  _component: \"common/Default Button\",\n                  contentText: `Delete ${record.name}`,\n                  onClick: [\n                    {\n                      \"##eventHandlerType\": \"Delete Record\",\n                      parameters: {\n                        recordKey: {\n                          \"##bbstate\": `selectedrow_${index.name}`,\n                          \"##source\": \"store\",\n                        },\n                      },\n                    },\n                  ],\n                },\n              },\n            ],\n          },\n        },\n      },\n    ],\n  },\n})\n","import {\n  recordHomepages,\n  homepageComponentName,\n  recordHomePageComponents,\n} from \"./recordHomePageGenerator\"\nimport { formName, forms } from \"./formsGenerator\"\n\nexport const selectNavContent = ({ indexes, records, helpers }) => [\n  ...recordHomepages({ indexes, records }).map(component),\n\n  ...recordHomePageComponents({ indexes, records, helpers }),\n\n  ...forms({ indexes, records, helpers }),\n]\n\nexport const navContentComponentName = record =>\n  `${record.name}/${record.name} Nav Content`\n\nconst component = ({ record }) => ({\n  inherits: \"@budibase/standard-components/if\",\n  description: `the component that gets displayed when the ${record.collectionName} nav is selected`,\n  name: navContentComponentName(record),\n  props: {\n    condition: `$store.isEditing${record.name}`,\n    thenComponent: {\n      _component: formName(record),\n    },\n    elseComponent: {\n      _component: homepageComponentName(record),\n    },\n  },\n})\n","import {\n  navContentComponentName,\n  selectNavContent,\n} from \"./selectedNavContentGenerator\"\nimport { recordHomepages } from \"./recordHomePageGenerator\"\nexport const app = ({ records, indexes, helpers }) => [\n  {\n    name: \"Application Root\",\n    inherits: \"@budibase/bootstrap-components/nav\",\n    props: {\n      items: recordHomepages({ indexes, records }).map(navItem),\n      orientation: \"horizontal\",\n      alignment: \"start\",\n      fill: false,\n      pills: true,\n      selectedItem: {\n        \"##bbstate\": \"selectedNav\",\n        \"##bbstatefallback\": `${records[0].name}`,\n        \"##bbsource\": \"store\",\n      },\n      className: \"p-3\",\n    },\n  },\n  {\n    name: \"Login\",\n    inherits: \"@budibase/standard-components/login\",\n    props: {},\n  },\n  ...selectNavContent({ records, indexes, helpers }),\n]\n\nexport const navItem = ({ record }) => ({\n  title: record.collectionName,\n  component: {\n    _component: navContentComponentName(record),\n  },\n})\n"],"names":["component"],"mappings":"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"} diff --git a/packages/builder/src/builderStore/store.js b/packages/builder/src/builderStore/store.js index cff94b8094..7749098945 100644 --- a/packages/builder/src/builderStore/store.js +++ b/packages/builder/src/builderStore/store.js @@ -680,14 +680,14 @@ const _savePage = async s => { }) } -const saveBackend = async s => { +const saveBackend = async state => { await api.post(`/_builder/api/${appname}/backend`, { appDefinition: { - hierarchy: s.hierarchy, - actions: s.actions, - triggers: s.triggers, + hierarchy: state.hierarchy, + actions: state.actions, + triggers: state.triggers, }, - accessLevels: s.accessLevels, + accessLevels: state.accessLevels, }) } diff --git a/packages/builder/src/common/Input.svelte b/packages/builder/src/common/Input.svelte index e7c5e78841..50b07f41f0 100644 --- a/packages/builder/src/common/Input.svelte +++ b/packages/builder/src/common/Input.svelte @@ -22,6 +22,6 @@ appearance: none; background: #fff; border: 1px solid #ccc; - height: 50px; + height: 35px; } diff --git a/packages/builder/src/common/Select.svelte b/packages/builder/src/common/Select.svelte index be0ccafa7c..2b9b67bb85 100644 --- a/packages/builder/src/common/Select.svelte +++ b/packages/builder/src/common/Select.svelte @@ -23,11 +23,9 @@ select { display: block; - font-size: 14px; font-family: sans-serif; font-weight: 500; color: #163057; - line-height: 1.3; padding: 1em 2.6em 0.9em 1.4em; width: 100%; max-width: 100%; @@ -38,7 +36,7 @@ appearance: none; background: #fff; border: 1px solid #ccc; - height: 50px; + height: 35px; } .arrow { diff --git a/packages/builder/src/userInterface/CurrentItemPreview.svelte b/packages/builder/src/userInterface/CurrentItemPreview.svelte index 7f0285f2d8..fb8a2ff255 100644 --- a/packages/builder/src/userInterface/CurrentItemPreview.svelte +++ b/packages/builder/src/userInterface/CurrentItemPreview.svelte @@ -70,6 +70,7 @@ hierarchy: $store.hierarchy, } + $: selectedComponentId = $store.currentComponentInfo ? $store.currentComponentInfo._id : ""
@@ -84,6 +85,11 @@ diff --git a/packages/builder/src/userInterface/PropertyCascader.svelte b/packages/builder/src/userInterface/PropertyCascader/PropertyCascader.svelte similarity index 56% rename from packages/builder/src/userInterface/PropertyCascader.svelte rename to packages/builder/src/userInterface/PropertyCascader/PropertyCascader.svelte index 7826e76baa..f0b08d98d9 100644 --- a/packages/builder/src/userInterface/PropertyCascader.svelte +++ b/packages/builder/src/userInterface/PropertyCascader/PropertyCascader.svelte @@ -1,8 +1,9 @@ + + + + diff --git a/packages/builder/src/userInterface/PropertyCascader/index.js b/packages/builder/src/userInterface/PropertyCascader/index.js new file mode 100644 index 0000000000..14b79c4e0c --- /dev/null +++ b/packages/builder/src/userInterface/PropertyCascader/index.js @@ -0,0 +1 @@ +export { default } from "./PropertyCascader.svelte" \ No newline at end of file diff --git a/packages/builder/src/userInterface/StateBindingControl.svelte b/packages/builder/src/userInterface/StateBindingControl.svelte index 6a5237051b..f96ae7fd08 100644 --- a/packages/builder/src/userInterface/StateBindingControl.svelte +++ b/packages/builder/src/userInterface/StateBindingControl.svelte @@ -1,7 +1,7 @@