@dartech/arsenal-ui 1.3.66 → 1.3.68

package/index.js

@@ -1212,12 +1212,16 @@ const deepParseJson = value => {
 
 const JsonView = /*#__PURE__*/forwardRef(({
   value,
-  height: _height = '200px',
+  height: _height = 200,
   fontSize: _fontSize = 16
 }, ref) => {
   const [loading, setLoading] = useState(true);
   const onCreateEditor = useCallback(view => {
     const onScroll = e => {
+      console.log();
+      if (view.scrollDOM.scrollHeight - view.scrollDOM.offsetHeight - e.target.scrollTop < 10) {
+        setTimeout(() => view.scrollDOM.scrollTo(0, 0), 200);
+      }
       if (e.target.scrollTop === 0) {
         setLoading(false);
         view.scrollDOM.removeEventListener('scroll', onScroll);
@@ -1226,16 +1230,13 @@ const JsonView = /*#__PURE__*/forwardRef(({
     if (view.scrollDOM.scrollHeight > 30000) {
       setLoading(true);
       view.scrollDOM.addEventListener('scroll', onScroll);
-      view.scrollDOM.scrollTo(0, view.scrollDOM.scrollHeight - 300);
+      view.scrollDOM.scrollTo(0, view.scrollDOM.scrollHeight - 1000);
       setTimeout(() => {
         view.scrollDOM.scrollTo({
           top: view.scrollDOM.scrollHeight,
           behavior: 'smooth'
         });
       }, 300);
-      setTimeout(() => {
-        view.scrollDOM.scrollTo(0, 0);
-      }, 500);
     } else {
       setLoading(false);
     }
@@ -1250,7 +1251,7 @@ const JsonView = /*#__PURE__*/forwardRef(({
       readOnly: true,
       width: "100%",
       value: typeof value === 'string' ? value : JSON.stringify(value, null, 2),
-      height: _height,
+      height: `${_height}px`,
       basicSetup: {
         autocompletion: true,
         history: true,
@@ -1274,12 +1275,6 @@ const JsonModalView = ({
   jsonViewProps
 }) => {
   const editorRef = useRef();
-  // useEffect(() => {
-  //   if (editorRef.current) {
-  //     console.log(editorRef.current);
-  //     editorRef.current.editor.scrollTop = 1000;
-  //   }
-  // }, [open, editorRef]);
   return jsxs(Dialog, Object.assign({
     disableEscapeKeyDown: true,
     open: open,
@@ -3124,7 +3119,7 @@ const InfoItem = ({
       children: text
     })), json && jsx(JsonView, {
       value: json,
-      height: "300px"
+      height: 300
     })]
   }));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dartech/arsenal-ui",
-  "version": "1.3.66",
+  "version": "1.3.68",
   "author": "DAR",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

package/src/lib/JsonView/JsonView.d.ts

@@ -2,7 +2,7 @@
 import { ReactCodeMirrorRef } from '@uiw/react-codemirror';
 type Props = {
     value: unknown;
-    height?: string;
+    height?: number;
     fontSize?: number;
 };
 export declare const JsonView: import("react").ForwardRefExoticComponent<Props & import("react").RefAttributes<ReactCodeMirrorRef>>;

package/src/lib/Modals/JsonModalView.d.ts

@@ -4,7 +4,7 @@ type Props = {
     value: string;
     onClose: () => void;
     jsonViewProps?: {
-        height?: string;
+        height?: number;
         fontSize?: number;
     };
 };