diff --git a/package.json b/package.json index fab5ef4..9d7ad37 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kne-components/components-document", - "version": "0.1.5", + "version": "0.1.6", "dependencies": { "highlight.js": "^11.9.0", "markdown-it": "^14.0.0", @@ -18,7 +18,7 @@ ], "scripts": { "init": "husky", - "start": "cross-env PORT=3001 MODULES_DEV_PUBLIC_URL=/ craco start", + "start": "cross-env PORT=3001 COMPONENTS_NAME=components-document MODULES_DEV_PUBLIC_URL=/ craco start", "build": "cross-env COMPONENTS_NAME=components-document MODULES_DEV_PUBLIC_URL=/components-document craco build", "test": "craco test --coverage", "eject": "react-scripts eject", @@ -75,9 +75,9 @@ "husky": "^8.0.3", "lint-staged": "^13.3.0", "lodash": "^4.17.21", - "node-sass": "^9.0.0", "prettier": "^2.8.8", "raw-loader": "^4.0.2", - "react-router-dom": "^6.22.2" + "react-router-dom": "^6.22.2", + "sass": "^1.83.0" } } diff --git a/src/components/MarkdownPage/index.js b/src/components/MarkdownPage/index.js index 80b9c7a..db22e71 100644 --- a/src/components/MarkdownPage/index.js +++ b/src/components/MarkdownPage/index.js @@ -17,17 +17,17 @@ const transformResponse = (response) => { const MarkdownPageInner = createWithRemoteLoader({ modules: ["components-core:Layout@Page", "components-core:Menu"] -})(({remoteModules, baseUrl, url, name, data, assetsPath, contentClassName,transformData, ...props}) => { +})(({remoteModules, baseUrl, url, name, data, assetsPath, contentClassName, transformMenuData, ...props}) => { const [Page, Menu] = remoteModules; const contentMap = useMemo(() => { - return new Map((typeof transformData === 'function' ? transformData(data) : data).map((item) => { + return new Map(data.map((item) => { return [item.id, item]; })); - }, [data,transformData]); + }, [data]); const menuItems = useMemo(() => { - return createFileTree(data, baseUrl); - }, [data, baseUrl]); + return createFileTree(typeof transformMenuData === 'function' ? transformMenuData(data) : data, baseUrl); + }, [data, baseUrl, transformMenuData]); if (!(data && data.length > 0)) { return ; @@ -61,8 +61,9 @@ MarkdownPageInner.defaultProps = { baseUrl: '', assetsPath: '/assets' }; -const MarkdownPage = ({name, url, ...props}) => { - return { + return { return }}/>