@nethru/ui 2.1.1 → 2.1.3

package/base/AddableFormList.js

@@ -20,6 +20,22 @@ const AddableFormList = /*#__PURE__*/forwardRef(({
   ...props
 }, ref) => {
   const removable = useMemo(() => allowEmpty || forms.length > 1, [allowEmpty, forms.length]);
+  const rightMargins = useMemo(() => {
+    const margins = [25, 30];
+    const counts = forms.map((form, index) => {
+      let count = 0;
+      if (!readOnly) {
+        if (showRemoveButton && renderButton(form, index)[0]) count++;
+        if (showAddButton && renderButton(form, index)[1]) count++;
+      }
+      return count;
+    });
+    const max = Math.max(...counts);
+    return counts.map((count, index) => {
+      const diff = max - count;
+      if (diff === 2) return margins[0] + margins[1];else if (diff === 1) return margins[count];else return 0;
+    });
+  }, [showAddButton, showRemoveButton, renderButton, forms, readOnly]);
   return /*#__PURE__*/_jsx(Stack, {
     ref: ref,
     gap: gap,
@@ -34,6 +50,7 @@ const AddableFormList = /*#__PURE__*/forwardRef(({
           alignItems: "start",
           gap: 1,
           marginTop: `${margins[index > 0 ? 1 : 0]}px`,
+          marginRight: `${rightMargins[index]}px`,
           children: [showRemoveButton && renderButton(form, index)[0] && /*#__PURE__*/_jsx(Tooltip, {
             title: "\uC0AD\uC81C",
             children: /*#__PURE__*/_jsx(IconButton, {

package/base/editor/Editor.js

@@ -7,6 +7,8 @@ import { nScript } from './nScript';
 import { Decoration, EditorView } from "@codemirror/view";
 import { RegExpCursor, SearchCursor } from '@codemirror/search';
 import { StateEffect, StateField } from "@codemirror/state";
+import { keymap as keyMapper } from '@codemirror/view';
+import { defaultKeymap } from '@codemirror/commands';
 import borderRadius from "../styles/borderRadius";
 import { blue, grey, red, yellow } from "../colors";
 import typography from "../styles/typography";
@@ -19,6 +21,7 @@ export default function Editor({
   error = false,
   helperText,
   basicSetup,
+  keymap = [],
   extensions = [],
   format = 'javascript',
   keyword,
@@ -139,8 +142,11 @@ export default function Editor({
         });
     }
   }, [format]);
+  const keymapExtension = useMemo(() => {
+    return [keyMapper.of(keymap), keyMapper.of(defaultKeymap)];
+  }, [keymap]);
   const extensionList = useMemo(() => {
-    const result = [languageExtension, EditorView.lineWrapping, highlight.extension];
+    const result = [languageExtension, EditorView.lineWrapping, highlight.extension, ...keymapExtension];
     if (onScroll) {
       result.push(EditorView.domEventHandlers({
         scroll(event, view) {
@@ -151,7 +157,7 @@ export default function Editor({
     }
     result.push(...extensions);
     return result;
-  }, [languageExtension, highlight.extension, extensions, onScroll]);
+  }, [languageExtension, highlight.extension, keymapExtension, extensions, onScroll]);
   const handleUpdate = viewUpdate => {
     setFocused(viewUpdate.view.hasFocus);
     if (onUpdate) onUpdate(viewUpdate);

package/base/styles/mui/iconButton.js

@@ -2,6 +2,10 @@ import { grey } from "../../colors";
 import borderRadius from "../borderRadius";
 import typography from "../typography";
 export const styles = {
+  defaultProps: {
+    variant: 'normal',
+    disableRipple: true
+  },
   variants: [{
     props: {
       variant: 'normal'
@@ -40,9 +44,6 @@ export const styles = {
       }
     }
   }],
-  defaultProps: {
-    variant: 'normal'
-  },
   styleOverrides: {
     root: {
       fontFamily: typography.fontFamily,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nethru/ui",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "main": "base/index.js",
   "files": [
     "/base"