From 71abc2a38d133d847a1d884818f3854b9db2339c Mon Sep 17 00:00:00 2001 From: Conor_Mack <36074859+Conor-Mack@users.noreply.github.com> Date: Tue, 28 Jan 2020 13:00:05 +0000 Subject: [PATCH] Aliasing config and additional test button component for test app (#66) * Fix for field modal infinite render loop once closed from click away * Added rollupgenerators to md to keep builder happy * Beginning the button component and general setup * Aliasing config and additional test button component for test app --- .../materialdesign-components/components.json | 30 ++- .../dist/generators.js | 207 +---------------- .../materialdesign-components/package.json | 4 + .../rollup.config.js | 51 +++-- .../rollup.generatorsconfig.js | 14 ++ .../rollup.testconfig.js | 212 +++++++++++------- .../src/Button.svelte | 12 + .../src/Test/TestApp.svelte | 47 ++-- .../src/Test/props.js | 20 +- .../src/Test/testComponents.js | 3 +- .../src/generators.js | 0 .../materialdesign-components/src/index.js | 3 +- 12 files changed, 254 insertions(+), 349 deletions(-) create mode 100644 packages/materialdesign-components/rollup.generatorsconfig.js create mode 100644 packages/materialdesign-components/src/Button.svelte create mode 100644 packages/materialdesign-components/src/generators.js diff --git a/packages/materialdesign-components/components.json b/packages/materialdesign-components/components.json index f6cc3eb501..2aface718d 100644 --- a/packages/materialdesign-components/components.json +++ b/packages/materialdesign-components/components.json @@ -1,12 +1,20 @@ { - "_lib": "./dist/index.js", - "h1": { - "name": "H1", - "description": "An HTML H1 tag", - "props" : { - "text": "string", - "className":"string" - }, - "tags": [] - } -} \ No newline at end of file + "_lib": "./dist/index.js", + "h1": { + "name": "H1", + "description": "An HTML H1 tag", + "props": { + "text": "string", + "className": "string" + }, + "tags": [] + }, + "button": { + "name": "Button", + "description": "A button", + "props": { + "raised": "bool" + }, + "tags": [] + } +} diff --git a/packages/materialdesign-components/dist/generators.js b/packages/materialdesign-components/dist/generators.js index 7fd547ea88..67dd2ee24a 100644 --- a/packages/materialdesign-components/dist/generators.js +++ b/packages/materialdesign-components/dist/generators.js @@ -1,207 +1,2 @@ -const headers = () => [ - { - name: "common/H1", - description: "Header 1", - inherits: "@budibase/standard-components/text", - props: { - font: "20pt", - } - }, - { - name: "common/H2", - description: "Header 2", - inherits: "@budibase/standard-components/text", - props: { - font: "15pt", - } - }, - { - name: "common/H3", - description: "Header 3", - inherits: "@budibase/standard-components/text", - props: { - font: "12pt bold", - } - }, - { - name: "common/H4", - description: "Header 4", - inherits: "@budibase/standard-components/text", - props: { - font: "10pt bold", - } - } -]; -const forms = ({records, indexes}) => - [...headers(), - ...records.map(root)]; - -const root = record => ({ - name: `${record.name} Form`, - description: `All fields on record '${record.nodeKey()}' `, - inherits: "@budibase/standard-components/stackpanel", - props: { - direction: "vertical", - children: [ - { - control: { - _component: "common/H1", - value: `Edit ${record.name}`, - } - }, - form(record), - saveCancelButtons(record) - ] - } -}); - -const form = record => ({ - control: { - _component: "@budibase/standard-components/form", - formControls: - record.fields.map(f => ({ - label: f.label, - control: { - _component: "@budibase/standard-components/textbox", - value: { - "##bbstate":`current${record.name}.${f.name}`, - "##bbsource":"store" - } - } - })) - } -}); - -const saveCancelButtons = (record) => ({ - control: { - _component: "@budibase/standard-components/stackpanel", - direction: "horizontal", - children: [ - paddedPanelForButton({ - _component: "common/Primary Button", - contentText: `Save ${record.name}`, - onClick: [ - { - "##eventHandlerType": "Save Record", - parameters: { - statePath: `current${record.name}`, - } - } - ] - }), - paddedPanelForButton({ - _component: "common/Secondary Button", - contentText: `Cancel`, - onClick: [ - { - "##eventHandlerType": "Save Record", - parameters: { - statePath: `current${record.name}`, - } - } - ] - }) - ] - } -}); - -const paddedPanelForButton = (button) => ({ - control: { - _component: "@budibase/standard-components/panel", - padding: "20px", - component: button - } -}); - -const indexTables = ({indexes, helpers}) => - indexes.filter(i => i.parent().type === "root") - .map(i => indexTable(i, helpers)); - -const indexTableProps = (index, helpers) => ({ - data: { - "##bbstate":index.nodeKey(), - "##bbsource":"store" - }, - columns: helpers.indexSchema(index).map(column) -}); - -const indexTable = (index, helpers) => ({ - name: `tables/${index.name} Table`, - inherits: "@budibase/standard-components/table", - props: indexTableProps(index, helpers) -}); - -const column = (col) => ({ - title: col.name, - value: { - "##bbstate": col.name, - "##bbsource":"context" - } -}); - -const nav = ({records, indexes, helpers}) => [ - { - name: "Application Root", - inherits: "@budibase/standard-components/nav", - props: { - items: indexes - .filter(i => i.parent().type === "root") - .map(navItem), - selectedItem: { - "##bbstate": "selectedNav", - "##bbstatefallback": records[0].collectionName, - "##bbsource":"store" - } - }, - }, - ...indexTables({records, indexes, helpers}) -]; - - -const navItem = (index) => ({ - title: index.name, - component : { - _component: `tables/${index.name} Table` - } -}); - -const app = (params) => { - - return [ - ...nav(params), - ...forms(params) - ]; -}; - -const buttons = () => [ - { - name: "common/Primary Button", - description: "a styled button", - inherits: "@budibase/standard-components/button", - props: { - padding: "5px 7px", - border: "1px solid #EEE", - color: "#5F6368", - background: "##f2f2f2", - hoverColor: "black", - hoverBackground: "#cccccc" - } - }, - { - name: "common/Secondary Button", - description: "a styled button", - inherits: "@budibase/standard-components/button", - props: { - padding: "5px 7px", - border: "1px solid #EEE", - color: "#5F6368", - background: "##f2f2f2", - hoverColor: "black", - hoverBackground: "#cccccc" - } - } -]; - -export { app, buttons, forms, headers, indexTables, nav }; -//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"file":"generators.js","sources":["../src/generators/headersGenerator.js","../src/generators/formsGenerator.js","../src/generators/indexTablesGenerator.js","../src/generators/navGenerator.js","../src/generators/appGenerator.js","../src/generators/buttonsGenerator.js"],"sourcesContent":["export const headers = () => [\r\n    {\r\n        name: \"common/H1\",\r\n        description: \"Header 1\",\r\n        inherits: \"@budibase/standard-components/text\",\r\n        props: {\r\n            font: \"20pt\",\r\n        }\r\n    },\r\n    {\r\n        name: \"common/H2\",\r\n        description: \"Header 2\",\r\n        inherits: \"@budibase/standard-components/text\",\r\n        props: {\r\n            font: \"15pt\",\r\n        }\r\n    },\r\n    {\r\n        name: \"common/H3\",\r\n        description: \"Header 3\",\r\n        inherits: \"@budibase/standard-components/text\",\r\n        props: {\r\n            font: \"12pt bold\",\r\n        }\r\n    },\r\n    {\r\n        name: \"common/H4\",\r\n        description: \"Header 4\",\r\n        inherits: \"@budibase/standard-components/text\",\r\n        props: {\r\n            font: \"10pt bold\",\r\n        }\r\n    }\r\n]","import {headers} from \"./headersGenerator\";\r\n\r\nexport const forms = ({records, indexes}) => \r\n    [...headers({records, indexes}),\r\n    ...records.map(root)];\r\n\r\nconst root = record => ({\r\n    name: `${record.name} Form`,\r\n    description: `All fields on record '${record.nodeKey()}' `,\r\n    inherits: \"@budibase/standard-components/stackpanel\",\r\n    props: {\r\n        direction: \"vertical\",\r\n        children: [\r\n            {\r\n                control: {\r\n                    _component: \"common/H1\",\r\n                    value: `Edit ${record.name}`,\r\n                }\r\n            },\r\n            form(record),\r\n            saveCancelButtons(record)\r\n        ]\r\n    }\r\n}) \r\n\r\nconst form = record => ({\r\n    control: {\r\n        _component: \"@budibase/standard-components/form\",\r\n        formControls: \r\n            record.fields.map(f => ({\r\n                label: f.label,\r\n                control: {\r\n                    _component: \"@budibase/standard-components/textbox\",\r\n                    value: {\r\n                        \"##bbstate\":`current${record.name}.${f.name}`,\r\n                        \"##bbsource\":\"store\"\r\n                    }\r\n                }\r\n            }))\r\n    }\r\n})\r\n\r\nconst saveCancelButtons = (record) => ({\r\n    control: {\r\n        _component: \"@budibase/standard-components/stackpanel\",\r\n        direction: \"horizontal\",\r\n        children: [\r\n            paddedPanelForButton({\r\n                _component: \"common/Primary Button\",\r\n                contentText: `Save ${record.name}`,\r\n                onClick: [                \r\n                    {\r\n                        \"##eventHandlerType\": \"Save Record\",\r\n                        parameters: {\r\n                            statePath: `current${record.name}`,\r\n                        }\r\n                    }\r\n                ]\r\n            }),\r\n            paddedPanelForButton({\r\n                _component: \"common/Secondary Button\",\r\n                contentText: `Cancel`,\r\n                onClick: [\r\n                    {\r\n                        \"##eventHandlerType\": \"Save Record\",\r\n                        parameters: {\r\n                            statePath: `current${record.name}`,\r\n                        }\r\n                    }\r\n                ]\r\n            })\r\n        ]\r\n    }\r\n})\r\n\r\nconst paddedPanelForButton = (button) => ({\r\n    control: {\r\n        _component: \"@budibase/standard-components/panel\",\r\n        padding: \"20px\",\r\n        component: button\r\n    }\r\n});\r\n\r\n","export const indexTables = ({indexes, helpers}) => \r\n    indexes.filter(i => i.parent().type === \"root\")\r\n           .map(i => indexTable(i, helpers));\r\n\r\nexport const indexTableProps = (index, helpers) => ({\r\n    data: {\r\n        \"##bbstate\":index.nodeKey(),\r\n        \"##bbsource\":\"store\"\r\n    },\r\n    columns: helpers.indexSchema(index).map(column)\r\n});\r\n\r\nconst indexTable = (index, helpers) => ({\r\n    name: `tables/${index.name} Table`,\r\n    inherits: \"@budibase/standard-components/table\",\r\n    props: indexTableProps(index, helpers)\r\n});\r\n\r\nconst column = (col) => ({\r\n    title: col.name,\r\n    value: {\r\n        \"##bbstate\": col.name,\r\n        \"##bbsource\":\"context\"\r\n    }\r\n})","import {indexTables} from \"./indexTablesGenerator\";\r\n\r\nexport const nav = ({records, indexes, helpers}) => [\r\n    {\r\n        name: \"Application Root\",\r\n        inherits: \"@budibase/standard-components/nav\",\r\n        props: {\r\n            items: indexes\r\n                    .filter(i => i.parent().type === \"root\")\r\n                    .map(navItem),\r\n            selectedItem: {\r\n                \"##bbstate\": \"selectedNav\",\r\n                \"##bbstatefallback\": records[0].collectionName,\r\n                \"##bbsource\":\"store\"\r\n            }\r\n        },\r\n    },\r\n    ...indexTables({records, indexes, helpers})\r\n]\r\n\r\n\r\nexport const navItem = (index) => ({\r\n    title: index.name,\r\n    component : {\r\n        _component: `tables/${index.name} Table`\r\n    }\r\n})\r\n\r\n","import { forms } from \"./formsGenerator\";\r\nimport { nav } from \"./navGenerator\";\r\n\r\nexport const app = (params) => {\r\n\r\n    return [\r\n        ...nav(params),\r\n        ...forms(params)\r\n    ];\r\n}\r\n\r\n","export const buttons = () => [\r\n    {\r\n        name: \"common/Primary Button\",\r\n        description: \"a styled button\",\r\n        inherits: \"@budibase/standard-components/button\",\r\n        props: {\r\n            padding: \"5px 7px\",\r\n            border: \"1px solid #EEE\",\r\n            color: \"#5F6368\",\r\n            background: \"##f2f2f2\",\r\n            hoverColor: \"black\",\r\n            hoverBackground: \"#cccccc\"\r\n        }\r\n    },\r\n    {\r\n        name: \"common/Secondary Button\",\r\n        description: \"a styled button\",\r\n        inherits: \"@budibase/standard-components/button\",\r\n        props: {\r\n            padding: \"5px 7px\",\r\n            border: \"1px solid #EEE\",\r\n            color: \"#5F6368\",\r\n            background: \"##f2f2f2\",\r\n            hoverColor: \"black\",\r\n            hoverBackground: \"#cccccc\"\r\n        }\r\n    }\r\n]"],"names":[],"mappings":"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"} +//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2VuZXJhdG9ycy5qcyIsInNvdXJjZXMiOltdLCJzb3VyY2VzQ29udGVudCI6W10sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIifQ== diff --git a/packages/materialdesign-components/package.json b/packages/materialdesign-components/package.json index 16f6582fde..69e08883ce 100644 --- a/packages/materialdesign-components/package.json +++ b/packages/materialdesign-components/package.json @@ -13,18 +13,22 @@ }, "devDependencies": { "@budibase/client": "^0.0.16", + "@material/button": "^4.0.0", "@nx-js/compiler-util": "^2.0.0", "bcryptjs": "^2.4.3", "fs-extra": "^8.1.0", "lodash": "^4.17.15", "npm-run-all": "^4.1.5", "rollup": "^1.11.0", + "rollup-plugin-alias": "^2.2.0", "rollup-plugin-commonjs": "^10.0.2", "rollup-plugin-json": "^4.0.0", "rollup-plugin-livereload": "^1.0.1", "rollup-plugin-node-resolve": "^5.0.0", + "rollup-plugin-postcss": "^2.0.5", "rollup-plugin-svelte": "^5.0.0", "rollup-plugin-terser": "^5.1.1", + "sass": "^1.25.1-test.1", "shortid": "^2.2.15", "sirv-cli": "^0.4.4", "svelte": "^3.12.1" diff --git a/packages/materialdesign-components/rollup.config.js b/packages/materialdesign-components/rollup.config.js index a2dbf1a644..9feb2cc374 100644 --- a/packages/materialdesign-components/rollup.config.js +++ b/packages/materialdesign-components/rollup.config.js @@ -1,20 +1,37 @@ -import svelte from 'rollup-plugin-svelte'; -import resolve from 'rollup-plugin-node-resolve'; +import svelte from "rollup-plugin-svelte"; +import postcss from "rollup-plugin-postcss"; +import resolve from "rollup-plugin-node-resolve"; +import path from "path"; + +const postcssOptions = () => ({ + extensions: [".scss", ".sass"], + extract: false, + minimize: true, + use: [ + [ + "sass", + { + includePaths: ["./node_modules"] + } + ] + ] +}); export default { - input: 'src/index.js', - output: [ - { - file: "dist/index.js", - format: 'esm', - name:"budibaseStandardComponents", - sourcemap: "inline" - } - ], - plugins: [ - svelte({ - hydratable:true - }), - resolve() - ] + input: "src/index.js", + output: [ + { + file: "dist/index.js", + format: "esm", + name: "budibaseStandardComponents", + sourcemap: "inline" + } + ], + plugins: [ + svelte({ + hydratable: true + }), + resolve(), + postcss(postcssOptions()) + ] }; diff --git a/packages/materialdesign-components/rollup.generatorsconfig.js b/packages/materialdesign-components/rollup.generatorsconfig.js new file mode 100644 index 0000000000..bbecc79c64 --- /dev/null +++ b/packages/materialdesign-components/rollup.generatorsconfig.js @@ -0,0 +1,14 @@ +import resolve from "rollup-plugin-node-resolve"; + +export default { + input: "src/generators.js", + output: [ + { + file: "dist/generators.js", + format: "esm", + name: "budibaseStandardComponents", + sourcemap: "inline" + } + ], + plugins: [resolve()] +}; diff --git a/packages/materialdesign-components/rollup.testconfig.js b/packages/materialdesign-components/rollup.testconfig.js index 8a6ab7ff7a..2ef69b8705 100644 --- a/packages/materialdesign-components/rollup.testconfig.js +++ b/packages/materialdesign-components/rollup.testconfig.js @@ -1,93 +1,149 @@ -import svelte from 'rollup-plugin-svelte'; -import resolve from 'rollup-plugin-node-resolve'; -import commonjs from 'rollup-plugin-commonjs'; -import livereload from 'rollup-plugin-livereload'; -import { terser } from 'rollup-plugin-terser'; -import json from 'rollup-plugin-json'; +import svelte from "rollup-plugin-svelte"; +import resolve from "rollup-plugin-node-resolve"; +import commonjs from "rollup-plugin-commonjs"; +import livereload from "rollup-plugin-livereload"; +import { terser } from "rollup-plugin-terser"; +import json from "rollup-plugin-json"; +import alias from "rollup-plugin-alias"; +import path from "path"; + +const aliases = { + resolve: [".js", ".svelte"], + entries: [ + { find: "@BBMD", replacement: path.resolve(__dirname, "dist/index.js") } + ] +}; const production = !process.env.ROLLUP_WATCH; const lodash_fp_exports = [ - "find", "isUndefined", "split", "max", - "last", "union", "reduce", "isObject", - "cloneDeep", "some", "isArray", "map", - "filter", "keys", "isFunction", "isEmpty", - "countBy", "join", "includes", "flatten", - "constant", "first", "intersection", "take", - "has", "mapValues", "isString", "isBoolean", - "isNull", "isNumber", "isObjectLike", "isDate", - "clone", "values", "keyBy", "isNaN", - "isInteger", "toNumber"]; + "find", + "isUndefined", + "split", + "max", + "last", + "union", + "reduce", + "isObject", + "cloneDeep", + "some", + "isArray", + "map", + "filter", + "keys", + "isFunction", + "isEmpty", + "countBy", + "join", + "includes", + "flatten", + "constant", + "first", + "intersection", + "take", + "has", + "mapValues", + "isString", + "isBoolean", + "isNull", + "isNumber", + "isObjectLike", + "isDate", + "clone", + "values", + "keyBy", + "isNaN", + "isInteger", + "toNumber" +]; const lodash_exports = [ - "flow", "head", "find","each", - "tail", "findIndex", "startsWith", - "dropRight", "takeRight", - "trim", "split", "replace", - "merge", "assign"]; + "flow", + "head", + "find", + "each", + "tail", + "findIndex", + "startsWith", + "dropRight", + "takeRight", + "trim", + "split", + "replace", + "merge", + "assign" +]; const coreExternal = [ - "lodash", "lodash/fp", "date-fns", - "lunr", "safe-buffer", "shortid", - "@nx-js/compiler-util", "bcryptjs" + "lodash", + "lodash/fp", + "date-fns", + "lunr", + "safe-buffer", + "shortid", + "@nx-js/compiler-util", + "bcryptjs" ]; export default { - input: 'src/Test/testMain.js', - output: { - sourcemap: true, - format: 'iife', - name: 'app', - file: 'public/bundle.js', - globals: { - "crypto": "crypto" - } - }, - plugins: [ - svelte({ - // enable run-time checks when not in production - dev: !production, - // we'll extract any component CSS out into - // a separate file — better for performance - css: css => { - css.write('public/bundle.css'); - }, - - hydratable:true - }), + input: "src/Test/testMain.js", + output: { + sourcemap: true, + format: "iife", + name: "app", + file: "public/bundle.js", + globals: { + crypto: "crypto" + } + }, + plugins: [ + alias(aliases), + svelte({ + // enable run-time checks when not in production + dev: !production, + // we'll extract any component CSS out into + // a separate file — better for performance + css: css => { + css.write("public/bundle.css"); + }, - // If you have external dependencies installed from - // npm, you'll most likely need these plugins. In - // some cases you'll need additional configuration — - // consult the documentation for details: - // https://github.com/rollup/rollup-plugin-commonjs - resolve({ - browser: true, - dedupe: importee => { - return importee === 'svelte' - || importee.startsWith('svelte/') - || coreExternal.includes(importee); - }, - preferBuiltins: true - }), - commonjs({ - namedExports: { - "lodash/fp": lodash_fp_exports, - "lodash":lodash_exports, - "shortid": ["generate"] - } - }), - json(), + hydratable: true + }), - // Watch the `public` directory and refresh the - // browser on changes when not in production - !production && livereload('public'), + // If you have external dependencies installed from + // npm, you'll most likely need these plugins. In + // some cases you'll need additional configuration — + // consult the documentation for details: + // https://github.com/rollup/rollup-plugin-commonjs + resolve({ + browser: true, + dedupe: importee => { + return ( + importee === "svelte" || + importee.startsWith("svelte/") || + coreExternal.includes(importee) + ); + }, + preferBuiltins: true + }), + commonjs({ + namedExports: { + "lodash/fp": lodash_fp_exports, + lodash: lodash_exports, + shortid: ["generate"] + } + }), + json(), - // If we're building for production (npm run build - // instead of npm run dev), minify - production && terser() - ], - watch: { - clearScreen: false - } + // Watch the `public` directory and refresh the + // browser on changes when not in production + !production && livereload("public"), + + // If we're building for production (npm run build + // instead of npm run dev), minify + production && terser() + ], + watch: { + clearScreen: false + } }; diff --git a/packages/materialdesign-components/src/Button.svelte b/packages/materialdesign-components/src/Button.svelte new file mode 100644 index 0000000000..639e0d3f51 --- /dev/null +++ b/packages/materialdesign-components/src/Button.svelte @@ -0,0 +1,12 @@ + + + diff --git a/packages/materialdesign-components/src/Test/TestApp.svelte b/packages/materialdesign-components/src/Test/TestApp.svelte index 7c7545a894..53298940d5 100644 --- a/packages/materialdesign-components/src/Test/TestApp.svelte +++ b/packages/materialdesign-components/src/Test/TestApp.svelte @@ -1,40 +1,35 @@ -{#await _appPromise} -loading -{:then _bb} - -