@yuneta/gobj-ui 7.23.180 → 7.23.182

package/README.md

@@ -572,7 +572,7 @@ Two layout facts the browser taught this component, both worth keeping:
 
 - Attributes: `subscriber`, `title` (i18n key, optional — hidden on mobile,
   where the toolbar cannot hold it as well as the buttons), `json_data`
-  (initial JSON, optional), `view_mode` (`"tree"` default | `"text"` |
+  (initial JSON, optional — given, the viewer starts in `ST_READY`), `view_mode` (`"tree"` default | `"text"` |
   `"graph"`), `$container` (mounted by the parent).
 - Input events: `EV_SET_JSON {json}` (replace the whole document; `ST_EMPTY` →
   `ST_READY`), `EV_SUBTREE_LOADED {path, json}` (splice a fetched subtree),

package/dist/gobj-ui.cjs.js

@@ -14023,6 +14023,7 @@ function mt_create$13(gobj) {
 *          Framework Method: Start
 ***************************************************************/
 function mt_start$13(gobj) {
+	if (gobj.priv.root !== null) (0, _yuneta_gobj_js.gobj_change_state)(gobj, "ST_READY");
 	render_view$1(gobj);
 }
 /***************************************************************
@@ -26820,57 +26821,57 @@ function build_ui$5(gobj) {
 		});
 		$view_toolbar.appendChild($search_box);
 	}
-	if (with_refresh_button) {
-		let $refresh = (0, _yuneta_gobj_js.createElement2)([
+	if (with_schema_button) {
+		let $schema = (0, _yuneta_gobj_js.createElement2)([
 			"button",
 			{
-				class: "button mr-1",
-				title: (0, i18next.t)("refresh"),
-				"data-i18n-title": "refresh",
-				"aria-label": (0, i18next.t)("refresh"),
-				"data-i18n-aria-label": "refresh"
+				class: "TREEDB_TABLE_SCHEMA button mr-1",
+				title: (0, i18next.t)("schema"),
+				"data-i18n-title": "schema",
+				"aria-label": (0, i18next.t)("schema"),
+				"data-i18n-aria-label": "schema"
 			},
-			[yui_toolbar_icon("yi-arrows-rotate"), [
+			[yui_toolbar_icon("yi-hexagon-nodes"), [
 				"span",
 				{
 					class: "is-hidden-mobile",
-					i18n: "refresh",
+					i18n: "schema",
 					style: "padding-left:5px;"
 				},
-				"refresh"
+				"schema"
 			]],
 			{ "click": (event) => {
 				event.stopPropagation();
-				(0, _yuneta_gobj_js.gobj_send_event)(gobj, "EV_REFRESH", {}, gobj);
+				(0, _yuneta_gobj_js.gobj_send_event)(gobj, "EV_SHOW_SCHEMA", {}, gobj);
 			} }
 		]);
-		$view_toolbar.appendChild($refresh);
+		$view_toolbar.appendChild($schema);
 	}
-	if (with_schema_button) {
-		let $schema = (0, _yuneta_gobj_js.createElement2)([
+	if (with_refresh_button) {
+		let $refresh = (0, _yuneta_gobj_js.createElement2)([
 			"button",
 			{
-				class: "TREEDB_TABLE_SCHEMA button mr-1",
-				title: (0, i18next.t)("schema"),
-				"data-i18n-title": "schema",
-				"aria-label": (0, i18next.t)("schema"),
-				"data-i18n-aria-label": "schema"
+				class: "button mr-1",
+				title: (0, i18next.t)("refresh"),
+				"data-i18n-title": "refresh",
+				"aria-label": (0, i18next.t)("refresh"),
+				"data-i18n-aria-label": "refresh"
 			},
-			[yui_toolbar_icon("yi-hexagon-nodes"), [
+			[yui_toolbar_icon("yi-arrows-rotate"), [
 				"span",
 				{
 					class: "is-hidden-mobile",
-					i18n: "schema",
+					i18n: "refresh",
 					style: "padding-left:5px;"
 				},
-				"schema"
+				"refresh"
 			]],
 			{ "click": (event) => {
 				event.stopPropagation();
-				(0, _yuneta_gobj_js.gobj_send_event)(gobj, "EV_SHOW_SCHEMA", {}, gobj);
+				(0, _yuneta_gobj_js.gobj_send_event)(gobj, "EV_REFRESH", {}, gobj);
 			} }
 		]);
-		$view_toolbar.appendChild($schema);
+		$view_toolbar.appendChild($refresh);
 	}
 	if (with_columns_button) {
 		let $columns = (0, _yuneta_gobj_js.createElement2)([

package/dist/gobj-ui.es.js

@@ -14018,6 +14018,7 @@ function mt_create$13(gobj) {
 *          Framework Method: Start
 ***************************************************************/
 function mt_start$13(gobj) {
+	if (gobj.priv.root !== null) gobj_change_state(gobj, "ST_READY");
 	render_view$1(gobj);
 }
 /***************************************************************
@@ -26815,57 +26816,57 @@ function build_ui$5(gobj) {
 		});
 		$view_toolbar.appendChild($search_box);
 	}
-	if (with_refresh_button) {
-		let $refresh = createElement2([
+	if (with_schema_button) {
+		let $schema = createElement2([
 			"button",
 			{
-				class: "button mr-1",
-				title: t("refresh"),
-				"data-i18n-title": "refresh",
-				"aria-label": t("refresh"),
-				"data-i18n-aria-label": "refresh"
+				class: "TREEDB_TABLE_SCHEMA button mr-1",
+				title: t("schema"),
+				"data-i18n-title": "schema",
+				"aria-label": t("schema"),
+				"data-i18n-aria-label": "schema"
 			},
-			[yui_toolbar_icon("yi-arrows-rotate"), [
+			[yui_toolbar_icon("yi-hexagon-nodes"), [
 				"span",
 				{
 					class: "is-hidden-mobile",
-					i18n: "refresh",
+					i18n: "schema",
 					style: "padding-left:5px;"
 				},
-				"refresh"
+				"schema"
 			]],
 			{ "click": (event) => {
 				event.stopPropagation();
-				gobj_send_event(gobj, "EV_REFRESH", {}, gobj);
+				gobj_send_event(gobj, "EV_SHOW_SCHEMA", {}, gobj);
 			} }
 		]);
-		$view_toolbar.appendChild($refresh);
+		$view_toolbar.appendChild($schema);
 	}
-	if (with_schema_button) {
-		let $schema = createElement2([
+	if (with_refresh_button) {
+		let $refresh = createElement2([
 			"button",
 			{
-				class: "TREEDB_TABLE_SCHEMA button mr-1",
-				title: t("schema"),
-				"data-i18n-title": "schema",
-				"aria-label": t("schema"),
-				"data-i18n-aria-label": "schema"
+				class: "button mr-1",
+				title: t("refresh"),
+				"data-i18n-title": "refresh",
+				"aria-label": t("refresh"),
+				"data-i18n-aria-label": "refresh"
 			},
-			[yui_toolbar_icon("yi-hexagon-nodes"), [
+			[yui_toolbar_icon("yi-arrows-rotate"), [
 				"span",
 				{
 					class: "is-hidden-mobile",
-					i18n: "schema",
+					i18n: "refresh",
 					style: "padding-left:5px;"
 				},
-				"schema"
+				"refresh"
 			]],
 			{ "click": (event) => {
 				event.stopPropagation();
-				gobj_send_event(gobj, "EV_SHOW_SCHEMA", {}, gobj);
+				gobj_send_event(gobj, "EV_REFRESH", {}, gobj);
 			} }
 		]);
-		$view_toolbar.appendChild($schema);
+		$view_toolbar.appendChild($refresh);
 	}
 	if (with_columns_button) {
 		let $columns = createElement2([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuneta/gobj-ui",
-  "version": "7.23.180",
+  "version": "7.23.182",
   "type": "module",
   "main": "dist/gobj-ui.cjs.js",
   "module": "dist/gobj-ui.es.js",

package/src/c_yui_json.js

@@ -86,6 +86,7 @@ import {
     refresh_language,
     kw_get_local_storage_value,
     kw_set_local_storage_value,
+    gobj_change_state,
 } from "@yuneta/gobj-js";
 
 import {
@@ -244,6 +245,14 @@ function mt_create(gobj)
  ***************************************************************/
 function mt_start(gobj)
 {
+    let priv = gobj.priv;
+
+    /*  The FSM starts in ST_EMPTY, and a viewer handed `json_data` at
+     *  create is not empty: left there it rendered the tree and then
+     *  answered every expand/collapse with "Event NOT DEFINED in state". */
+    if(priv.root !== null) {
+        gobj_change_state(gobj, "ST_READY");
+    }
     render_view(gobj);
 }
 

package/src/c_yui_treedb_topic_with_form.js

@@ -795,23 +795,6 @@ function build_ui(gobj)
         $view_toolbar.appendChild($search_box);
     }
 
-    if(with_refresh_button) {
-        let $refresh = createElement2(
-            ['button', {class: 'button mr-1',
-                        title: t('refresh'), 'data-i18n-title': 'refresh',
-                        'aria-label': t('refresh'), 'data-i18n-aria-label': 'refresh'}, [
-                yui_toolbar_icon('yi-arrows-rotate'),
-                ['span', {class: 'is-hidden-mobile', i18n: 'refresh', style: 'padding-left:5px;'}, 'refresh']
-            ], {
-                'click': (event) => {
-                    event.stopPropagation();
-                    gobj_send_event(gobj, "EV_REFRESH", {}, gobj);
-                }
-            }]
-        );
-        $view_toolbar.appendChild($refresh);
-    }
-
     if(with_schema_button) {
         /*  What the columns of this topic ARE: types, flags, fkeys. The
          *  table shows the data; this shows the contract the data answers
@@ -833,6 +816,28 @@ function build_ui(gobj)
         $view_toolbar.appendChild($schema);
     }
 
+    /*  The ORDER is a contract shared with every table toolbar of the
+     *  ecosystem: what is particular to this view first (search, schema),
+     *  then the common block ALWAYS as Refresh, Columns, Export, then Close
+     *  when there is one. A button that moves from view to view has to be
+     *  looked for every time. */
+    if(with_refresh_button) {
+        let $refresh = createElement2(
+            ['button', {class: 'button mr-1',
+                        title: t('refresh'), 'data-i18n-title': 'refresh',
+                        'aria-label': t('refresh'), 'data-i18n-aria-label': 'refresh'}, [
+                yui_toolbar_icon('yi-arrows-rotate'),
+                ['span', {class: 'is-hidden-mobile', i18n: 'refresh', style: 'padding-left:5px;'}, 'refresh']
+            ], {
+                'click': (event) => {
+                    event.stopPropagation();
+                    gobj_send_event(gobj, "EV_REFRESH", {}, gobj);
+                }
+            }]
+        );
+        $view_toolbar.appendChild($refresh);
+    }
+
     if(with_columns_button) {
         /*  A topic with a dozen columns is wider than the screen, and until
          *  now the reader could not decide WHICH of them to keep: the table
@@ -2567,9 +2572,6 @@ function open_schema_dialog(gobj)
     priv.schema_modal = presented.modal;
     priv.schema_win = presented.win;
 
-    /*  EV_SET_JSON and not the `json_data` attr: the attr renders the
-     *  tree but leaves the viewer in ST_IDLE, where a click to expand a
-     *  node is an event nobody handles. */
     gobj_send_event(json_view, "EV_SET_JSON", {json: desc}, gobj);
 }
 
@@ -2697,9 +2699,6 @@ function open_cell_json_dialog(gobj, row_id, col_id)
     priv.cell_json_modal = presented.modal;
     priv.cell_json_win = presented.win;
 
-    /*  EV_SET_JSON and not the `json_data` attr: the attr renders the
-     *  tree but leaves the viewer in ST_IDLE, where a click to expand a
-     *  node is an event nobody handles. */
     gobj_send_event(json_view, "EV_SET_JSON", {json: value}, gobj);
 }