Merge branch 'develop'

.github/workflows/blank.yml

@@ -5,9 +5,9 @@ env:
 
 on:
     push:
-        branches: [main, develop]
+        branches: [ main, develop ]
     pull_request:
-        branches: [main, develop]
+        branches: [ main, develop ]
 
     # Allows you to run this workflow manually from the Actions tab
     workflow_dispatch:
@@ -17,7 +17,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                node-version: [18.x]
+                node-version: [ 18.x ]
         steps:
             -   uses: actions/checkout@v3
             -   name: Set Branch
@@ -66,23 +66,23 @@ jobs:
 
             -   name: CP License files
                 run: |
-                    cp LICENSE dist/input
+                    cp LICENSE dist/struct
                     cp LICENSE dist/md
-                    cp LICENSE dist/md-mui
                     cp LICENSE dist/react
-                    #cp LICENSE dist/struct
+                    cp LICENSE dist/md-mui
+                    cp LICENSE dist/input
 
             -   name: Publish to NPM
                 if: github.ref == 'refs/heads/main'
                 #if: startsWith(github.ref, 'refs/tags/')
                 run: |
                     echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}' > ~/.npmrc
 
-                    node publish.js dist/input
+                    node publish.js dist/struct
                     node publish.js dist/md
-                    node publish.js dist/md-mui
                     node publish.js dist/react
-                    #node publish.js dist/struct
+                    node publish.js dist/md-mui
+                    node publish.js dist/input
 
                     rm ~/.npmrc
                 env:

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 bemit UG (haftungsbeschränkt), Michael Becker https://i-am-digital.eu
+Copyright (c) 2024 bemit UG (haftungsbeschränkt), Michael Becker https://i-am-digital.eu
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -5,20 +5,22 @@
 ## Packages
 
 - [@content-ui/md](./packages/md) [![MIT license](https://img.shields.io/npm/l/@content-ui/md?style=flat-square)](https://github.com/control-ui/content-ui/blob/main/LICENSE) [![npm (scoped)](https://img.shields.io/npm/v/@content-ui/md?style=flat-square)](https://www.npmjs.com/package/@content-ui/md) [![JS compatibility](https://img.shields.io/badge/ESM--f7e018?style=flat-square&logo=javascript)](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c)
-    - markdown / html to AST, using [remark / rehype](https://unifiedjs.com/) for parsing
+    - markdown to AST, using [remark](https://unifiedjs.com/) for parsing
 - [@content-ui/react](./packages/react) [![MIT license](https://img.shields.io/npm/l/@content-ui/react?style=flat-square)](https://github.com/control-ui/content-ui/blob/main/LICENSE) [![npm (scoped)](https://img.shields.io/npm/v/@content-ui/react?style=flat-square)](https://www.npmjs.com/package/@content-ui/react) [![react compatibility](https://img.shields.io/badge/React-%3E%3D17-success?style=flat-square&logo=react)](https://reactjs.org/) [![JS compatibility](https://img.shields.io/badge/ESM--f7e018?style=flat-square&logo=javascript)](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c)
     - ReactJS hooks and providers for the other react packages
 - [@content-ui/md-mui](./packages/md-mui) [![MIT license](https://img.shields.io/npm/l/@content-ui/md-mui?style=flat-square)](https://github.com/control-ui/content-ui/blob/main/LICENSE) [![npm (scoped)](https://img.shields.io/npm/v/@content-ui/md-mui?style=flat-square)](https://www.npmjs.com/package/@content-ui/md-mui) [![react compatibility](https://img.shields.io/badge/React-%3E%3D17-success?style=flat-square&logo=react)](https://reactjs.org/) [![depends on MUI](https://img.shields.io/badge/MUI-green?labelColor=1a237e&color=0d47a1&logoColor=ffffff&style=flat-square&logo=mui)](https://mui.com)
     - MUI leafs for content-leafs, using [@tactic-ui](https://github.com/ui-schema/tactic-ui) for rendering
 - [@content-ui/input](./packages/input) [![MIT license](https://img.shields.io/npm/l/@content-ui/input?style=flat-square)](https://github.com/control-ui/content-ui/blob/main/LICENSE) [![npm (scoped)](https://img.shields.io/npm/v/@content-ui/input?style=flat-square)](https://www.npmjs.com/package/@content-ui/input) [![react compatibility](https://img.shields.io/badge/React-%3E%3D17-success?style=flat-square&logo=react)](https://reactjs.org/) [![depends on MUI](https://img.shields.io/badge/MUI-green?labelColor=1a237e&color=0d47a1&logoColor=ffffff&style=flat-square&logo=mui)](https://mui.com)
     - MUI styled code / text input field based on `CodeMirror`
 - [@content-ui/struct](./packages/struct) [![MIT license](https://img.shields.io/npm/l/@content-ui/struct?style=flat-square)](https://github.com/control-ui/content-ui/blob/main/LICENSE) [![npm (scoped)](https://img.shields.io/npm/v/@content-ui/struct?style=flat-square)](https://www.npmjs.com/package/@content-ui/struct) [![JS compatibility](https://img.shields.io/badge/ESM--f7e018?style=flat-square&logo=javascript)](https://gist.github.com/sindresorhus/a39789f98801d908bbc7ff3ecc99d99c)
-    - structural content analyzer and information aggregation
+    - structural helper utils and mdast typing extensions
 
 ```shell
 npm i -S @content-ui/md @content-ui/react @content-ui/md-mui @content-ui/input
 # peer-dependencies:
-npm i -S @tactic-ui/react @mui/material @mui/icons-material react-progress-state @ui-controls/progress
+npm i -S @mui/material @mui/icons-material
+# peer-dependencies for /input:
+npm i -S react-progress-state @ui-controls/progress
 # peer-dependencies for CodeMirror
 npm i -S @ui-schema/kit-codemirror @codemirror/state .. todo ..
 ```
@@ -56,4 +58,4 @@ npm run build
 
 This project is distributed as **free software** under the **MIT License**, see [License](https://github.com/control-ui/content-ui/blob/main/LICENSE).
 
-© 2023 bemit UG (haftungsbeschränkt)
+© 2024 bemit UG (haftungsbeschränkt)

apps/demo/LICENSE_LEZER-MD.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Eric Rykwalder
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

apps/demo/src/App.tsx

@@ -115,7 +115,7 @@ export const App: React.ComponentType<{}> = () => {
                         >
                             <LocalizationProvider dateAdapter={AdapterMoment}>
                                 <UIMetaProvider t={browserT} widgets={customWidgets}>
-                                    <ContentLeafsProvider deco={contentUIDecorators} render={contentUIMapping}>
+                                    <ContentLeafsProvider deco={contentUIDecorators} renderMap={contentUIMapping}>
                                         <ProgressControlProvider>
                                             <DndProvider backend={HTML5Backend}>
                                                 <Layout/>

apps/demo/src/components/ContentUI.ts

@@ -1,9 +1,8 @@
 import { renderMapping } from '@content-ui/md-mui/LeafsMarkdown'
-import { LeafsRenderMapping } from '@tactic-ui/react/LeafsEngine'
-import { ContentLeafComponents, ContentLeafsNodeMapping } from '@content-ui/react/ContentLeaf'
+import { ContentLeafComponents, ContentLeafsNodeMapping, LeafsRenderMapping } from '@content-ui/react/ContentLeaf'
 import { CustomCodeMirror } from './CustomCodeMirror.js'
 
-export const contentUIMapping: LeafsRenderMapping<ContentLeafsNodeMapping, ContentLeafComponents> = {
+export const contentUIMapping: LeafsRenderMapping<ContentLeafsNodeMapping, ContentLeafComponents, { type: string }> = {
     ...renderMapping,
     leafs: {
         ...renderMapping.leafs,
@@ -12,4 +11,5 @@ export const contentUIMapping: LeafsRenderMapping<ContentLeafsNodeMapping, Conte
         ...renderMapping.components,
         CodeMirror: CustomCodeMirror,
     },
+    matchLeaf: (p, l) => l[p.type],
 }