@nethru/ui 2.0.5 → 2.0.7

package/base/AddableFormList.js

@@ -15,6 +15,7 @@ const AddableFormList = /*#__PURE__*/forwardRef(({
   margins = [5, 5],
   showAddButton = true,
   showRemoveButton = true,
+  allowEmpty = false,
   ...props
 }, ref) => {
   return /*#__PURE__*/_jsx(Stack, {
@@ -36,7 +37,7 @@ const AddableFormList = /*#__PURE__*/forwardRef(({
             children: /*#__PURE__*/_jsx(IconButton, {
               variant: "menu",
               onClick: _ => onRemove(index),
-              disabled: forms.length === 1,
+              disabled: !allowEmpty && forms.length === 1,
               children: /*#__PURE__*/_jsx(RemoveIcon, {
                 sx: {
                   fontSize: 17
@@ -56,7 +57,7 @@ const AddableFormList = /*#__PURE__*/forwardRef(({
             })
           })]
         })]
-      }, form.id)), forms.length === 0 && /*#__PURE__*/_jsx(Typography, {
+      }, form.id ?? form)), forms.length === 0 && /*#__PURE__*/_jsx(Typography, {
         variant: "bodySmRegular",
         children: "\uD56D\uBAA9\uC774 \uC5C6\uC2B5\uB2C8\uB2E4"
       })]

package/base/ColumnedSection.js

@@ -15,8 +15,8 @@ const ColumnedSection = /*#__PURE__*/forwardRef(({
     const point = Math.floor(12 / columns);
     if (columns <= 3) {
       return {
-        xs: 12,
-        sm: point
+        sm: 12,
+        md: point
       };
     }
     return {

package/base/SearchableSelect.js

@@ -14,6 +14,7 @@ const SearchableSelect = /*#__PURE__*/forwardRef(({
   labelKey = 'label',
   groupKey,
   error,
+  fullWidth,
   formControlProps,
   textFieldProps,
   ...props
@@ -37,6 +38,7 @@ const SearchableSelect = /*#__PURE__*/forwardRef(({
     disabled: props.disabled,
     error: error,
     sx: styles,
+    fullWidth: fullWidth,
     ...formControlProps,
     children: [label && /*#__PURE__*/_jsx(InputLabel, {
       disabled: props.disabled,

package/base/Select.js

@@ -7,6 +7,7 @@ const Select = /*#__PURE__*/forwardRef(({
   label,
   helperText,
   size,
+  fullWidth,
   children,
   formControlProps,
   ...props
@@ -21,6 +22,7 @@ const Select = /*#__PURE__*/forwardRef(({
     disabled: props.disabled,
     error: props.error,
     sx: styles,
+    fullWidth: fullWidth,
     ...formControlProps,
     children: [label && /*#__PURE__*/_jsx(InputLabel, {
       children: label

package/base/editor/Editor.js

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { Box, Typography } from "@mui/material";
+import { Box, FormHelperText } from "@mui/material";
 import CodeMirror from '@uiw/react-codemirror';
 import { javascript } from '@codemirror/lang-javascript';
 import { json } from '@codemirror/lang-json';
@@ -7,6 +7,10 @@ import { nScript } from './nScript';
 import { Decoration, EditorView } from "@codemirror/view";
 import { RegExpCursor, SearchCursor } from '@codemirror/search';
 import { StateEffect, StateField } from "@codemirror/state";
+import borderRadius from "../styles/borderRadius";
+import { blue, grey, red, yellow } from "../colors";
+import typography from "../styles/typography";
+import shadow from "../styles/shadow";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export default function Editor({
@@ -32,29 +36,69 @@ export default function Editor({
   const [view, setView] = useState();
   const [content, setContent] = useState('');
   const [focused, setFocused] = useState(false);
+  const theme = useMemo(() => EditorView.theme({
+    '&': {
+      fontSize: '13px',
+      outline: 'none !important'
+    },
+    '.cm-scroller': {
+      border: `1px solid ${error ? red[500] : focused ? grey[900] : grey[300]}`,
+      borderRadius: `${borderRadius[2]}px`
+    },
+    '.cm-gutters': {
+      width: '42px',
+      justifyContent: 'center',
+      fontFamily: typography.fontFamily,
+      ...typography.bodyMdMedium,
+      backgroundColor: grey[50],
+      borderRight: `1px solid ${grey[300]}`
+    },
+    '.cm-content': {
+      ...typography.code
+    },
+    '.cm-content.cm-lineWrapping': {
+      wordBreak: 'break-all'
+    },
+    '.cm-content .cm-activeLine': {
+      backgroundColor: blue[5]
+    },
+    '.cm-content .cm-selectionMatch': {
+      backgroundColor: blue[100]
+    },
+    '.cm-selectionLayer .cm-selectionBackground': {
+      backgroundColor: `${blue[200]} !important`
+    },
+    '.cm-tooltip': {
+      fontFamily: typography.fontFamily,
+      ...typography.bodySmRegular,
+      borderRadius: `${borderRadius[1]}px`,
+      boxShadow: shadow[1]
+    },
+    '.cm-tooltip-autocomplete ul li[aria-selected]': {
+      color: 'unset',
+      backgroundColor: blue[100]
+    },
+    '.cm-tooltip.cm-completionInfo': {
+      top: '0px !important',
+      left: '101% !important',
+      maxWidth: '300px !important'
+    }
+  }, {
+    dark: false
+  }), [focused, error]);
   const styles = useMemo(() => {
     return {
-      maxWidth: restrictWidth && ref.current ? `${ref.current.offsetWidth}px` : 'unset',
-      borderBottom: focused || error ? `3px solid ${error ? '#d32f2f' : '#1976d2'}` : `${!readOnly ? '2px' : '0px'} solid rgba(0, 0, 0, 0.42)`
+      maxWidth: restrictWidth && ref.current ? `${ref.current.offsetWidth}px` : 'unset'
     };
     // eslint-disable-next-line
-  }, [readOnly, error, focused, ref.current]);
-  const helperTextStyles = useMemo(() => {
-    return {
-      color: error ? '#d32f2f' : '#555',
-      fontSize: 12,
-      ml: '14px',
-      mt: '3px'
-    };
-  }, [error]);
+  }, [restrictWidth, ref.current]);
   const highlight = useMemo(() => {
     const highlightEffect = StateEffect.define();
     const decoration = Decoration.mark({
       attributes: {
-        style: "background-color:#e9db5d" //#90caf9
+        style: `background-color: ${yellow[100]}`
       }
     });
-
     const extension = StateField.define({
       create() {
         return Decoration.none;
@@ -153,13 +197,14 @@ export default function Editor({
       },
       onCreateEditor: (view, state) => setView(view),
       onUpdate: handleUpdate,
+      theme: theme,
       style: {
         ...style,
         ...styles
       },
       ...props
-    }), helperText && /*#__PURE__*/_jsx(Typography, {
-      sx: helperTextStyles,
+    }), helperText && /*#__PURE__*/_jsx(FormHelperText, {
+      error: error,
       children: helperText
     })]
   });

package/base/styles/globalStyles.js

@@ -19,20 +19,8 @@ const globalStyles = {
   },
   body: {
     fontFamily: typography.fontFamily,
-    backgroundColor: blueGrey.contentBg
-  },
-  code: {
-    fontFamily: typography.fontFamily
-  },
-  '.cm-theme-light': {
-    fontFamily: "source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace",
-    fontSize: '14px'
-  },
-  '.cm-editor, .cm-editor.cm-focused': {
-    outline: '1px solid #eaeaea'
-  },
-  '.cm-editor .cm-content.cm-lineWrapping': {
-    wordBreak: 'break-all'
+    backgroundColor: blueGrey.contentBg,
+    minWidth: '1280px'
   },
   '.highcharts-tooltip-box': {
     fillOpacity: 0

package/base/styles/mui/button.js

@@ -249,14 +249,14 @@ export const styles = {
     }) => ({
       minWidth: 60,
       height: ownerState.color === 'crud' ? 26 : 36,
-      padding: ownerState.color === 'crud' ? '0px 2px' : '8px 20px',
+      padding: ownerState.color === 'crud' ? '4px 6px' : '8px 12px',
       fontSize: typography.bodyMdSemibold.fontSize,
       fontWeight: typography.bodyMdSemibold.fontWeight
     }),
     sizeSmall: {
       minWidth: '50px',
       height: '26px',
-      padding: '8px 12px',
+      padding: '8px 8px',
       fontSize: typography.bodySmSemibold.fontSize,
       fontWeight: typography.bodySmSemibold.fontWeight
     },

package/base/styles/mui/formControlLabel.js

@@ -10,6 +10,7 @@ export const styles = {
       }
     },
     label: {
+      // whiteSpace: 'nowrap',
       '&.Mui-disabled': {
         color: grey[400]
       }

package/base/styles/typography.js

@@ -121,9 +121,10 @@ const typography = {
     letterSpacing: 0
   },
   code: {
+    fontFamily: "D2Coding, 'D2 coding', monospace",
     color: grey[900],
-    fontSize: '13px',
-    fontWeight: 500,
+    fontSize: '14px',
+    fontWeight: 400,
     lineHeight: 1.6,
     letterSpacing: 0
   }

package/package.json

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