@basthon/console-react 0.3.1 → 0.3.3

package/lib/components/app.d.ts

@@ -2,6 +2,7 @@ import { FC, PropsWithChildren } from "react";
 import { type BasthonContextProps } from "@basthon/gui-react";
 import { type Theme } from "../state-manager";
 interface InnerAppProps {
+    initFromStorage?: boolean;
     forceTheme?: Theme;
     compactHeader?: boolean;
     onChangeEditor?: () => void;

package/lib/components/app.js

@@ -9,10 +9,10 @@ import { Header } from "./header";
 import { MainContainer } from "./main-container";
 import { Footer } from "./footer";
 import * as styles from "./styles.module.scss";
-const InnerApp = ({ forceTheme, compactHeader, onChangeEditor, children, }) => {
+const InnerApp = ({ initFromStorage, forceTheme, compactHeader, onChangeEditor, children, }) => {
     const gui = useGUI();
     // state
-    const [state, dispatch] = stateManager.useReducer(gui.language);
+    const [state, dispatch] = stateManager.useReducer(gui.language, initFromStorage ?? true);
     const language = stateManager.language(state);
     const theme = forceTheme != null ? forceTheme : stateManager.theme(state);
     // set data-theme for basthon-loader footer
@@ -29,9 +29,14 @@ const InnerApp = ({ forceTheme, compactHeader, onChangeEditor, children, }) => {
 /**
  * Main app setting up state manager, header, main container and footer.
  */
-const ConsoleApp = ({ forceTheme, compactHeader, onChangeEditor, children, ...props }) => {
+const ConsoleApp = ({ initFromStorage, forceTheme, compactHeader, onChangeEditor, children, ...props }) => {
     props.GUI = GUI;
-    const innerProps = { forceTheme, compactHeader, onChangeEditor };
+    const innerProps = {
+        initFromStorage,
+        forceTheme,
+        compactHeader,
+        onChangeEditor,
+    };
     return (_jsx(BasthonContext, { ...props, children: _jsx(InnerApp, { ...innerProps, children: children }) }));
 };
 export default ConsoleApp;

package/lib/gui/editor.d.ts

@@ -7,7 +7,6 @@ export default class Editor {
     private _kernel;
     private _editor;
     private _onSetContent?;
-    private _silentChange;
     constructor(element: HTMLElement, kernel: KernelBase, onSetContent?: (_: string) => void, onChange?: () => void);
     /**
      * Set Ace mode from language.
@@ -19,9 +18,8 @@ export default class Editor {
     setTheme(theme: Theme): Promise<void>;
     /**
      * Dispatch action to set content.
-     * If silent is true, editor's onChange is not triggered.
      */
-    setContent(content: string, silent?: boolean): void;
+    setContent(content: string): void;
     /**
      * Set Ace editor content.
      */

package/lib/gui/editor.js

@@ -4,7 +4,6 @@ import ace from "./ace";
  */
 export default class Editor {
     constructor(element, kernel, onSetContent, onChange) {
-        this._silentChange = false;
         this._kernel = kernel;
         this._onSetContent = onSetContent;
         this._editor = ace.edit(element);
@@ -17,11 +16,7 @@ export default class Editor {
         });
         // connect onchange
         if (onChange != null)
-            this._editor.session.on("change", () => {
-                if (!this._silentChange)
-                    onChange();
-                this._silentChange = false;
-            });
+            this._editor.session.on("change", () => onChange());
         /* editor's completion */
         // removing all completers and keeping track of local completer
         const localCompleter = this._editor.completers[1]; // any hint to detect this dynamically?
@@ -88,10 +83,8 @@ export default class Editor {
     }
     /**
      * Dispatch action to set content.
-     * If silent is true, editor's onChange is not triggered.
      */
-    setContent(content, silent = false) {
-        this._silentChange = silent === true;
+    setContent(content) {
         this._onSetContent?.(content);
     }
     /**
@@ -99,9 +92,7 @@ export default class Editor {
      */
     setContentNoDispatch(content) {
         if (content != null)
-            this._editor.setValue(content);
-        this._editor.scrollToRow(0);
-        this._editor.gotoLine(0, 0, false);
+            this._editor.setValue(content, -1);
     }
     /**
      * Get editor's content

package/lib/gui/gui.d.ts

@@ -39,9 +39,8 @@ export default class GUI extends GUIBase {
     content(): string;
     /**
      * Set editor's content.
-     * If silent is true, editor's onChange is not triggered.
      */
-    setContent(content: string, silent?: boolean): void;
+    setContent(content: string): void;
     /**
      * Notify the user with an error.
      */

package/lib/gui/gui.js

@@ -62,10 +62,9 @@ export default class GUI extends GUIBase {
     }
     /**
      * Set editor's content.
-     * If silent is true, editor's onChange is not triggered.
      */
-    setContent(content, silent = false) {
-        this._editor?.setContent(content, silent);
+    setContent(content) {
+        this._editor?.setContent(content);
     }
     /**
      * Notify the user with an error.

package/lib/state-manager.d.ts

@@ -17,7 +17,7 @@ interface Action {
     payload?: Theme | ViewMode | RightPanel | State | string;
 }
 declare const stateManager: {
-    useReducer: (language: Language) => readonly [{
+    useReducer: (language: Language, initFromStorage: boolean) => readonly [{
         language: Language;
         ready: boolean;
         theme: Theme;

package/lib/state-manager.js

@@ -42,7 +42,8 @@ const reducer = (state, action) => {
     const { type, payload } = action;
     switch (type) {
         case "init": {
-            const state = copy(payload);
+            if (state != null)
+                state = copy(payload);
             state.ready = true;
             return state;
         }
@@ -77,16 +78,19 @@ const reducer = (state, action) => {
 };
 /* stateManager exposed as API */
 const stateManager = {
-    useReducer: (language) => {
+    useReducer: (language, initFromStorage) => {
         const [state, dispatch] = useImmerReducer(reducer, {
             ...initialState,
             language,
         });
         // dispatch init from storage
         useEffect(() => {
-            stateFromStorage(language).then((payload) => {
+            (async () => {
+                let payload = undefined;
+                if (initFromStorage)
+                    payload = await stateFromStorage(language);
                 dispatch({ type: "init", payload });
-            });
+            })();
         }, []);
         return [state, dispatch];
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@basthon/console-react",
-  "version": "0.3.1",
+  "version": "0.3.3",
   "description": "Basthon - Console React Component",
   "homepage": "https://basthon.fr",
   "bugs": {