Merge branch 'develop'

Author: elbakerino

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 bemit UG (haftungsbeschränkt)
+Copyright (c) 2025 Michael Becker <[email protected]> (https://bemit.codes)
 
 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

@@ -12,8 +12,12 @@ CodeMirror v6 integration for React, with MUI widgets for [UI-Schema](https://gi
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](http://makeapullrequest.com)
 ![Typed](https://flat.badgen.net/badge/icon/Typed?icon=typescript&label&labelColor=blue&color=555555)
 
-- [CodeMirror](https://codemirror.net/) v6 as plain React integration: `@ui-schema/kit-codemirror` [![npm (scoped)](https://img.shields.io/npm/v/@ui-schema/kit-codemirror?style=flat-square)](https://www.npmjs.com/package/@ui-schema/kit-codemirror) [![Component Documentation](https://img.shields.io/badge/Documentation-green?labelColor=0a6e8a&color=61dafb&logoColor=ffffff&style=flat-square&logo=react)](./docs/kit-codemirror/kit-codemirror.md)
-- UI-Schema Widgets for [MUI](https://mui.com): `@ui-schema/material-code` [![npm (scoped)](https://img.shields.io/npm/v/@ui-schema/material-code?style=flat-square)](https://www.npmjs.com/package/@ui-schema/material-code) [![Component Documentation](https://img.shields.io/badge/Documentation-green?labelColor=1a237e&color=0d47a1&logoColor=ffffff&style=flat-square&logo=mui)](./docs/material-code/material-code.md)
+- [CodeMirror v6](https://codemirror.net/) for React, with just the necessities:
+    - `@ui-schema/kit-codemirror` [![npm (scoped)](https://img.shields.io/npm/v/@ui-schema/kit-codemirror?style=flat-square)](https://www.npmjs.com/package/@ui-schema/kit-codemirror)
+    - [Documentation](./docs/kit-codemirror/kit-codemirror.md)
+- UI-Schema Widgets for [MUI](https://mui.com):
+    - `@ui-schema/material-code` [![npm (scoped)](https://img.shields.io/npm/v/@ui-schema/material-code?style=flat-square)](https://www.npmjs.com/package/@ui-schema/material-code)
+    - [Documentation](./docs/material-code/material-code.md)
 
 [![Visit Core Project](https://img.shields.io/badge/Visit%20Core%20Project-blue?labelColor=fff&color=107b8c&style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNDYuMjkgMTQ0Ljg3Ij48ZGVmcz48c3R5bGU+LmE0M2YzMmM3LTZiOWUtNDZhZi05Y2RkLWUxNzc1YjJjNzZiMHtmaWxsOiMwMzM5NDQ7fS5lNDNmYmJjMS0xNWM1LTRhZmUtOTdkNS0yYTk3YzY3MGJmZTN7ZmlsbDojMDVhZWNhO308L3N0eWxlPjwvZGVmcz48dGl0bGU+VUktU2NoZW1hPC90aXRsZT48cGF0aCBjbGFzcz0iYTQzZjMyYzctNmI5ZS00NmFmLTljZGQtZTE3NzViMmM3NmIwIiBkPSJNNTMuMjgsM0MzNCwzLDMwLDIsMTguMTIsNS4yMmMtMTAsMi43Mi0xNiwxMi4zMS0xNiwyMi43NC0uMTMsMTctLjI5LDM0LC4wNiw1MC45My41OCwyOC43NSwyMS4zNiw1NS4zOCw1MC4wNyw2NC43OSwzOC42NCwxMi42Niw4MC4yLTguMjUsOTIuNjgtNDYuNjQuMTMtLjM5LjMxLTEuMzYuMzMtMS40Mi0xLjIyLjM4LTEuNCwxLjE2LTEuODMsMS45LTkuNjksMTctMjQuNDIsMjUuNjUtNDMuOTIsMjUuNzdhNDQuNDMsNDQuNDMsMCwwLDEtMjIuODQtNi42M2MtMTMtNy42Ni0yMS0xOC44NC0yMi45LTM0IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgtMS45MyAtMi41MSkiLz48cGF0aCBjbGFzcz0iZTQzZmJiYzEtMTVjNS00YWZlLTk3ZDUtMmE5N2M2NzBiZmUzIiBkPSJNMTI1LjgsMzUuNzhjLTctOC40MS0xMy4xOS0xNy40MS0yMC42MS0yNS40NS02LjEyLDUuMjItOC4zMSwxMi4xOC04LjM4LDE5Ljg2LS4xMywxNC42NC0uMjEsMjkuMjguMDYsNDMuOTIuMjEsMTEuMzItNi40MiwyMC4xOC0xNywyMi41NkM3MC42NCw5OC43NCw2MC43Niw5NS40Nyw1NSw4NC4zNWExMi4yMiwxMi4yMiwwLDAsMC0xLjI2LTEuNzJjMS45MiwxNS4xOSw5LjkxLDI2LjM3LDIyLjksMzRhNDQuNDMsNDQuNDMsMCwwLDAsMjIuODQsNi42M2MxOS41LS4xMiwzNC4yMy04LjczLDQzLjkyLTI1Ljc3LjQzLS43NC42MS0xLjUyLDEuODMtMS45QzE0OSw4NC44LDE0OC4yNCwzMi4xNSwxNDgsMjEiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xLjkzIC0yLjUxKSIvPjxwYXRoIGNsYXNzPSJhNDNmMzJjNy02YjllLTQ2YWYtOWNkZC1lMTc3NWIyYzc2YjAiIGQ9Ik0xNDgsMjFWMy4xN2MtMy0uMTctMjEuMzUtMS44NS0zMS41My44OWEzMS42NSwzMS42NSwwLDAsMC0xMS4yOCw2LjI3YzcuNDIsOCwxMy42NSwxNywyMC42MSwyNS40NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTEuOTMgLTIuNTEpIi8+PC9zdmc+Cg==)](https://github.com/ui-schema/ui-schema)
 

package-lock.json

@@ -33,7 +33,7 @@
         "sloc": "node ./sloc.js",
         "release": "lerna publish from-package --contents build --no-git-reset"
     },
-    "author": "Michael Becker, https://i-am-digital.eu",
+    "author": "Michael Becker <[email protected]> (https://bemit.codes)",
     "license": "MIT",
     "devDependencies": {
         "@jest/types": "^29.6.3",

package.json

@@ -4,7 +4,7 @@
     "version": "0.1.0",
     "description": "",
     "homepage": "",
-    "author": "Michael Becker <[email protected]>",
+    "author": "Michael Becker <[email protected]> (https://bemit.codes)",
     "license": "MIT",
     "scripts": {
         "tscheck": "tsc --noEmit"
@@ -27,14 +27,14 @@
         "@codemirror/lang-sql": "^6.0.0",
         "@codemirror/search": "^6.0.0",
         "@codemirror/language": "^6.1.0",
-        "@ui-schema/dictionary": "~0.1.0-alpha.1",
-        "@ui-schema/ds-material": "~0.5.0-alpha.1",
+        "@ui-schema/dictionary": "~0.1.0-alpha.2",
+        "@ui-schema/ds-material": "~0.5.0-alpha.2",
         "@ui-schema/kit-codemirror": "^1.0.0-alpha.0",
         "@ui-schema/material-code": "~0.5.0-alpha.0",
-        "@ui-schema/react": "~0.5.0-alpha.1",
-        "@ui-schema/ui-schema": "~0.5.0-alpha.1",
-        "@ui-schema/json-schema": "~0.5.0-alpha.1",
-        "@ui-schema/json-pointer": "~0.5.0-alpha.1",
+        "@ui-schema/react": "~0.5.0-alpha.2",
+        "@ui-schema/ui-schema": "~0.5.0-alpha.2",
+        "@ui-schema/json-schema": "~0.5.0-alpha.2",
+        "@ui-schema/json-pointer": "~0.5.0-alpha.2",
         "immutable": "^5.0.0",
         "react": "^19.0",
         "react-dom": "^19.0",

packages/demo/package.json

@@ -5,8 +5,9 @@ import { schemaPluginsAdapterBuilder } from '@ui-schema/react/SchemaPluginsAdapt
 import { StoreKeyType } from '@ui-schema/ui-schema/ValueStore'
 import { Map } from 'immutable'
 import React from 'react'
-import { baseComponents, typeWidgets } from '@ui-schema/ds-material/BindingDefault'
-import { bindingExtended } from '@ui-schema/ds-material/BindingExtended'
+import { bindingComponents } from '@ui-schema/ds-material/Binding/Components'
+import { widgetsDefault } from '@ui-schema/ds-material/Binding/WidgetsDefault'
+import { widgetsExtended } from '@ui-schema/ds-material/Binding/WidgetsExtended'
 import { SchemaGridHandler } from '@ui-schema/ds-material/Grid'
 import Button from '@mui/material/Button'
 import { json } from '@codemirror/lang-json'
@@ -94,12 +95,12 @@ const CustomWidgetCodeSelectable: React.ComponentType<WidgetProps> = (
 }
 
 export const customBinding: MuiBinding = {
-    ...baseComponents,
+    ...bindingComponents,
 
     // Widget mapping by schema type or custom ID.
     widgets: {
-        ...typeWidgets,
-        ...bindingExtended,
+        ...widgetsDefault,
+        ...widgetsExtended,
 
         Code: CustomWidgetCode,
         CodeSelectable: CustomWidgetCodeSelectable,

packages/demo/src/components/UISchema.tsx

@@ -1,3 +1,4 @@
+import { isRemoteChange } from '@ui-schema/kit-codemirror/isRemoteChange'
 import React from 'react'
 import Container from '@mui/material/Container'
 import Box from '@mui/material/Box'
@@ -129,8 +130,8 @@ const DemoComponentReadOnly = () => {
     const [readOnly, setReadOnly] = React.useState(false)
     const [value, setValue] = React.useState('')
 
-    const onChange: CodeMirrorOnChange = React.useCallback((editor, newValue) => {
-        if(!editor.docChanged || typeof newValue !== 'string') {
+    const onChange: CodeMirrorOnChange = React.useCallback((update, newValue) => {
+        if(!update.docChanged || typeof newValue !== 'string' || isRemoteChange(update)) {
             return
         }
         setValue(newValue)

packages/demo/src/pages/PageDemoComponent.tsx

@@ -1,5 +1,5 @@
 import Button from '@mui/material/Button'
-import { isRemoteChange } from '@ui-schema/kit-codemirror'
+import { isRemoteChange } from '@ui-schema/kit-codemirror/isRemoteChange'
 import React from 'react'
 import Container from '@mui/material/Container'
 import Box from '@mui/material/Box'

packages/demo/src/pages/PageDemoComponentMui.tsx

@@ -3,7 +3,31 @@
 Thin-wrapper for CodeMirror v6 to use as React Component, with hooks and stuff to build more advanced editors easily.
 
 - [Documentation](https://github.com/ui-schema/react-codemirror/blob/main/docs/kit-codemirror)
-- [Demo](https://github.com/ui-schema/react-codemirror/blob/main/packages/demo/src/pages/PageDemoComponent.tsx)
+- [Example Code](https://github.com/ui-schema/react-codemirror/blob/main/packages/demo/src/pages/PageDemoComponent.tsx)
+
+```tsx
+import { useState, useCallback } from 'react'
+import { CodeMirror } from '@ui-schema/kit-codemirror/CodeMirror'
+import { isRemoteChange } from '@ui-schema/kit-codemirror/isRemoteChange'
+import type { CodeMirrorOnChange } from '@ui-schema/kit-codemirror/useCodeMirror'
+import type { CodeMirrorComponentProps, CodeMirrorProps } from '@ui-schema/kit-codemirror/CodeMirror'
+
+const DemoComponent = () => {
+    const [value, setValue] = useState('')
+
+    const onChange: CodeMirrorOnChange = useCallback((update, newValue) => {
+        if(!update.docChanged || typeof newValue !== 'string' || isRemoteChange(update)) {
+            return
+        }
+        setValue(newValue)
+    }, [setValue])
+
+    return <CodeMirror
+        value={value}
+        onChange={onChange}
+    />
+}
+```
 
 ## License
 

packages/kit-codemirror/README.md

@@ -1,24 +1,16 @@
 {
     "name": "@ui-schema/kit-codemirror",
-    "version": "1.0.0-alpha.2",
+    "version": "1.0.0-alpha.3",
     "description": "CodeMirror v6 as React Component, with hooks and stuff - but only the necessities.",
-    "author": {
-        "name": "bemit",
-        "url": "https://bemit.codes"
-    },
-    "contributors": [
-        {
-            "name": "Michael Becker",
-            "url": "https://i-am-digital.eu"
-        }
-    ],
+    "author": "Michael Becker <[email protected]> (https://bemit.codes)",
     "license": "MIT",
     "keywords": [
         "codemirror",
         "codemirror6",
         "react-component",
         "react"
     ],
+    "homepage": "https://github.com/ui-schema/react-codemirror/tree/main/packages/kit-codemirror",
     "repository": {
         "type": "git",
         "url": "https://github.com/ui-schema/react-codemirror.git",