@yuneta/gobj-ui 7.23.181 → 7.23.182

package/dist/gobj-ui.cjs.js

@@ -26821,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

@@ -26816,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.181",
+  "version": "7.23.182",
   "type": "module",
   "main": "dist/gobj-ui.cjs.js",
   "module": "dist/gobj-ui.es.js",

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