@yuneta/gobj-ui 7.14.0 → 7.14.2

package/dist/gobj-ui.cjs.js

@@ -17139,6 +17139,30 @@ function build_ui$5(gobj) {
 	(0, _yuneta_gobj_js.refresh_language)($container, i18next.t);
 }
 /************************************************************
+*   What the SELECTION drives: the two toolbar buttons that act
+*   on it, and the bar that counts it.
+*
+*   Read from the table every time, never from a running tally:
+*   rows leave the selection by routes that do not announce it
+*   (deleting a selected row deselects it SILENTLY, see
+*   ac_node_deleted).
+************************************************************/
+function render_selection_state(gobj) {
+	let $container = (0, _yuneta_gobj_js.gobj_read_attr)(gobj, "$container");
+	let $delete = $container ? $container.querySelector(`.button-delete-record`) : null;
+	let $copy = $container ? $container.querySelector(`.button-copy-record`) : null;
+	if ($delete && $copy) {
+		if (yui_selected_rows((0, _yuneta_gobj_js.gobj_read_attr)(gobj, "tabulator")).length > 0 && (0, _yuneta_gobj_js.gobj_read_bool_attr)(gobj, "editable")) {
+			$delete.removeAttribute("disabled");
+			$copy.removeAttribute("disabled");
+		} else {
+			$delete.setAttribute("disabled", true);
+			$copy.setAttribute("disabled", true);
+		}
+	}
+	render_selection_bar(gobj);
+}
+/************************************************************
 *   How many rows are ticked, on the bar.
 *
 *   Only while the table is EDITABLE: outside edition its checkbox
@@ -18418,6 +18442,7 @@ function ac_node_deleted$1(gobj, event, kw, src) {
 	let tabulator = (0, _yuneta_gobj_js.gobj_read_attr)(gobj, "tabulator");
 	if (tabulator) for (let record of data) if (tabulator.getRow(record.id)) tabulator.deleteRow(record.id);
 	else (0, _yuneta_gobj_js.log_error)("delete_data: record not found: " + record.id);
+	render_selection_state(gobj);
 	return 0;
 }
 /************************************************************
@@ -18594,20 +18619,7 @@ function ac_form_save_record(gobj, event, kw, src) {
 *  { rows: [row] }
 ************************************************************/
 function ac_select_rows(gobj, event, kw, src) {
-	let tabulator = (0, _yuneta_gobj_js.gobj_read_attr)(gobj, "tabulator");
-	let $container = (0, _yuneta_gobj_js.gobj_read_attr)(gobj, "$container");
-	let $button_delete_record = $container.querySelector(`.button-delete-record`);
-	let $button_copy_record = $container.querySelector(`.button-copy-record`);
-	if ($button_delete_record) {
-		if (yui_selected_rows(tabulator).length && (0, _yuneta_gobj_js.gobj_read_bool_attr)(gobj, "editable")) {
-			$button_delete_record.removeAttribute("disabled");
-			$button_copy_record.removeAttribute("disabled");
-		} else {
-			$button_delete_record.setAttribute("disabled", true);
-			$button_copy_record.setAttribute("disabled", true);
-		}
-	}
-	render_selection_bar(gobj);
+	render_selection_state(gobj);
 	if ((0, _yuneta_gobj_js.gobj_read_bool_attr)(gobj, "broadcast_select_rows_event")) (0, _yuneta_gobj_js.gobj_publish_event)(gobj, event, kw);
 	return 0;
 }
@@ -18615,20 +18627,7 @@ function ac_select_rows(gobj, event, kw, src) {
 *  { rows: [row] }
 ************************************************************/
 function ac_unselect_rows(gobj, event, kw, src) {
-	let tabulator = (0, _yuneta_gobj_js.gobj_read_attr)(gobj, "tabulator");
-	let $container = (0, _yuneta_gobj_js.gobj_read_attr)(gobj, "$container");
-	let $button_delete_record = $container.querySelector(`.button-delete-record`);
-	let $button_copy_record = $container.querySelector(`.button-copy-record`);
-	if ($button_delete_record) {
-		if (yui_selected_rows(tabulator).length && (0, _yuneta_gobj_js.gobj_read_bool_attr)(gobj, "editable")) {
-			$button_delete_record.removeAttribute("disabled");
-			$button_copy_record.removeAttribute("disabled");
-		} else {
-			$button_delete_record.setAttribute("disabled", true);
-			$button_copy_record.setAttribute("disabled", true);
-		}
-	}
-	render_selection_bar(gobj);
+	render_selection_state(gobj);
 	if ((0, _yuneta_gobj_js.gobj_read_bool_attr)(gobj, "broadcast_select_rows_event")) (0, _yuneta_gobj_js.gobj_publish_event)(gobj, event, kw);
 	return 0;
 }
@@ -23752,7 +23751,6 @@ function remote_command(gobj, command, kw) {
 function build_model(gobj) {
 	let priv = gobj.priv;
 	priv.model = build_schema_model(priv.records);
-	priv.order_undo = {};
 	priv.baseline = {};
 	for (let treedb of priv.model.treedbs) for (let topic of treedb.topics) priv.baseline[topic.id] = topic.topic_version;
 }
@@ -25837,7 +25835,8 @@ function version_writes(gobj, topic) {
 ***************************************************************/
 function remember_order(gobj, topic) {
 	let priv = gobj.priv;
-	if (!topic || !priv.order_undo || priv.order_undo[topic.id]) return;
+	if (!priv.order_undo) priv.order_undo = {};
+	if (!topic || priv.order_undo[topic.id]) return;
 	priv.order_undo[topic.id] = topic.cols.map((col) => {
 		return {
 			id: col.id,
@@ -26069,6 +26068,7 @@ function ac_mt_command_answer(gobj, event, kw, src) {
 			render(gobj);
 			return 0;
 		}
+		priv.order_undo = {};
 		build_model(gobj);
 		return go(gobj, priv.treedb_id, priv.topic_name, priv.diagram, false);
 	}

package/dist/gobj-ui.es.js

@@ -17134,6 +17134,30 @@ function build_ui$5(gobj) {
 	refresh_language($container, t);
 }
 /************************************************************
+*   What the SELECTION drives: the two toolbar buttons that act
+*   on it, and the bar that counts it.
+*
+*   Read from the table every time, never from a running tally:
+*   rows leave the selection by routes that do not announce it
+*   (deleting a selected row deselects it SILENTLY, see
+*   ac_node_deleted).
+************************************************************/
+function render_selection_state(gobj) {
+	let $container = gobj_read_attr(gobj, "$container");
+	let $delete = $container ? $container.querySelector(`.button-delete-record`) : null;
+	let $copy = $container ? $container.querySelector(`.button-copy-record`) : null;
+	if ($delete && $copy) {
+		if (yui_selected_rows(gobj_read_attr(gobj, "tabulator")).length > 0 && gobj_read_bool_attr(gobj, "editable")) {
+			$delete.removeAttribute("disabled");
+			$copy.removeAttribute("disabled");
+		} else {
+			$delete.setAttribute("disabled", true);
+			$copy.setAttribute("disabled", true);
+		}
+	}
+	render_selection_bar(gobj);
+}
+/************************************************************
 *   How many rows are ticked, on the bar.
 *
 *   Only while the table is EDITABLE: outside edition its checkbox
@@ -18413,6 +18437,7 @@ function ac_node_deleted$1(gobj, event, kw, src) {
 	let tabulator = gobj_read_attr(gobj, "tabulator");
 	if (tabulator) for (let record of data) if (tabulator.getRow(record.id)) tabulator.deleteRow(record.id);
 	else log_error("delete_data: record not found: " + record.id);
+	render_selection_state(gobj);
 	return 0;
 }
 /************************************************************
@@ -18589,20 +18614,7 @@ function ac_form_save_record(gobj, event, kw, src) {
 *  { rows: [row] }
 ************************************************************/
 function ac_select_rows(gobj, event, kw, src) {
-	let tabulator = gobj_read_attr(gobj, "tabulator");
-	let $container = gobj_read_attr(gobj, "$container");
-	let $button_delete_record = $container.querySelector(`.button-delete-record`);
-	let $button_copy_record = $container.querySelector(`.button-copy-record`);
-	if ($button_delete_record) {
-		if (yui_selected_rows(tabulator).length && gobj_read_bool_attr(gobj, "editable")) {
-			$button_delete_record.removeAttribute("disabled");
-			$button_copy_record.removeAttribute("disabled");
-		} else {
-			$button_delete_record.setAttribute("disabled", true);
-			$button_copy_record.setAttribute("disabled", true);
-		}
-	}
-	render_selection_bar(gobj);
+	render_selection_state(gobj);
 	if (gobj_read_bool_attr(gobj, "broadcast_select_rows_event")) gobj_publish_event(gobj, event, kw);
 	return 0;
 }
@@ -18610,20 +18622,7 @@ function ac_select_rows(gobj, event, kw, src) {
 *  { rows: [row] }
 ************************************************************/
 function ac_unselect_rows(gobj, event, kw, src) {
-	let tabulator = gobj_read_attr(gobj, "tabulator");
-	let $container = gobj_read_attr(gobj, "$container");
-	let $button_delete_record = $container.querySelector(`.button-delete-record`);
-	let $button_copy_record = $container.querySelector(`.button-copy-record`);
-	if ($button_delete_record) {
-		if (yui_selected_rows(tabulator).length && gobj_read_bool_attr(gobj, "editable")) {
-			$button_delete_record.removeAttribute("disabled");
-			$button_copy_record.removeAttribute("disabled");
-		} else {
-			$button_delete_record.setAttribute("disabled", true);
-			$button_copy_record.setAttribute("disabled", true);
-		}
-	}
-	render_selection_bar(gobj);
+	render_selection_state(gobj);
 	if (gobj_read_bool_attr(gobj, "broadcast_select_rows_event")) gobj_publish_event(gobj, event, kw);
 	return 0;
 }
@@ -23739,7 +23738,6 @@ function remote_command(gobj, command, kw) {
 function build_model(gobj) {
 	let priv = gobj.priv;
 	priv.model = build_schema_model(priv.records);
-	priv.order_undo = {};
 	priv.baseline = {};
 	for (let treedb of priv.model.treedbs) for (let topic of treedb.topics) priv.baseline[topic.id] = topic.topic_version;
 }
@@ -25824,7 +25822,8 @@ function version_writes(gobj, topic) {
 ***************************************************************/
 function remember_order(gobj, topic) {
 	let priv = gobj.priv;
-	if (!topic || !priv.order_undo || priv.order_undo[topic.id]) return;
+	if (!priv.order_undo) priv.order_undo = {};
+	if (!topic || priv.order_undo[topic.id]) return;
 	priv.order_undo[topic.id] = topic.cols.map((col) => {
 		return {
 			id: col.id,
@@ -26056,6 +26055,7 @@ function ac_mt_command_answer(gobj, event, kw, src) {
 			render(gobj);
 			return 0;
 		}
+		priv.order_undo = {};
 		build_model(gobj);
 		return go(gobj, priv.treedb_id, priv.topic_name, priv.diagram, false);
 	}

package/package.json

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

package/src/c_yui_schema_editor.js

@@ -528,9 +528,6 @@ function build_model(gobj)
     let priv = gobj.priv;
 
     priv.model = build_schema_model(priv.records);
-    /*  The order to go back to is the one that was on screen; a reload
-     *  brings the stored one, so what was on screen is gone. */
-    priv.order_undo = {};
     priv.baseline = {};
     for(let treedb of priv.model.treedbs) {
         for(let topic of treedb.topics) {
@@ -2166,7 +2163,10 @@ function remember_order(gobj, topic)
 {
     let priv = gobj.priv;
 
-    if(!topic || !priv.order_undo || priv.order_undo[topic.id]) {
+    if(!priv.order_undo) {
+        priv.order_undo = {};
+    }
+    if(!topic || priv.order_undo[topic.id]) {
         return;     /*  the first drag already said where we started  */
     }
     priv.order_undo[topic.id] = topic.cols.map((col) => {
@@ -2528,6 +2528,11 @@ function ac_mt_command_answer(gobj, event, kw, src)
             render(gobj);
             return 0;
         }
+        /*  Records straight from the store: what an undo would name is the
+         *  order that was ON SCREEN, and this is the stored one arriving.
+         *  (NOT in build_model(): that also runs on the patch after every
+         *  write, which is exactly when the undo has to survive.)  */
+        priv.order_undo = {};
         build_model(gobj);
         /*  Back to where the operator was: the load may be a refresh, or
          *  the answer to a deep link that arrived before the model.  */

package/src/c_yui_treedb_topic_with_form.js

@@ -679,6 +679,35 @@ function build_ui(gobj)
     refresh_language($container, t);
 }
 
+/************************************************************
+ *   What the SELECTION drives: the two toolbar buttons that act
+ *   on it, and the bar that counts it.
+ *
+ *   Read from the table every time, never from a running tally:
+ *   rows leave the selection by routes that do not announce it
+ *   (deleting a selected row deselects it SILENTLY, see
+ *   ac_node_deleted).
+ ************************************************************/
+function render_selection_state(gobj)
+{
+    let $container = gobj_read_attr(gobj, "$container");
+    let $delete = $container ? $container.querySelector(`.button-delete-record`) : null;
+    let $copy = $container ? $container.querySelector(`.button-copy-record`) : null;
+
+    if($delete && $copy) {
+        let some = yui_selected_rows(gobj_read_attr(gobj, "tabulator")).length > 0;
+        if(some && gobj_read_bool_attr(gobj, "editable")) {
+            $delete.removeAttribute("disabled");
+            $copy.removeAttribute("disabled");
+        } else {
+            $delete.setAttribute("disabled", true);
+            $copy.setAttribute("disabled", true);
+        }
+    }
+
+    render_selection_bar(gobj);
+}
+
 /************************************************************
  *   How many rows are ticked, on the bar.
  *
@@ -2625,7 +2654,6 @@ function ac_node_deleted(gobj, event, kw, src)
     }
 
     let tabulator = gobj_read_attr(gobj, "tabulator");
-    //tabulator.deselectRow(); // unselectAll TODO ??? is necessary?
 
     if(tabulator) {
         for(let record of data) {
@@ -2639,6 +2667,18 @@ function ac_node_deleted(gobj, event, kw, src)
         }
     }
 
+    /*  There WAS a commented-out `deselectRow()` here, asking whether it was
+     *  needed. It is not: Tabulator's own SelectRow module subscribes to
+     *  `row-deleting` and deselects the row it is about to remove, so a
+     *  deleted row cannot stay in the selection.
+     *
+     *  What IS needed is this line. That deselect is SILENT
+     *  (`_deselectRow(row, true)`), so no `rowDeselected` arrives, no
+     *  EV_UNSELECT_ROWS is sent, and everything the selection drives would
+     *  keep describing rows that are gone: the bar saying "3 selected" over a
+     *  table with none, and Delete and Copy still enabled.  */
+    render_selection_state(gobj);
+
     return 0;
 }
 
@@ -2928,26 +2968,7 @@ function ac_form_save_record(gobj, event, kw, src)
  ************************************************************/
 function ac_select_rows(gobj, event, kw, src)
 {
-    let tabulator = gobj_read_attr(gobj, "tabulator");
-    let $container = gobj_read_attr(gobj, "$container");
-
-    /*
-     *  Update button DELETE, only enable if some row is selected
-     */
-    let $button_delete_record = $container.querySelector(`.button-delete-record`);
-    let $button_copy_record = $container.querySelector(`.button-copy-record`);
-    if($button_delete_record) {
-        let selectedRows = yui_selected_rows(tabulator);
-        if (selectedRows.length && gobj_read_bool_attr(gobj, "editable")) {
-            $button_delete_record.removeAttribute("disabled");
-            $button_copy_record.removeAttribute("disabled");
-        } else {
-            $button_delete_record.setAttribute("disabled", true);
-            $button_copy_record.setAttribute("disabled", true);
-        }
-    }
-
-    render_selection_bar(gobj);
+    render_selection_state(gobj);
 
     if(gobj_read_bool_attr(gobj, "broadcast_select_rows_event")) {
         gobj_publish_event(gobj, event, kw);
@@ -2961,26 +2982,7 @@ function ac_select_rows(gobj, event, kw, src)
  ************************************************************/
 function ac_unselect_rows(gobj, event, kw, src)
 {
-    let tabulator = gobj_read_attr(gobj, "tabulator");
-    let $container = gobj_read_attr(gobj, "$container");
-
-    /*
-     *  Update button DELETE, only enable if some row is selected
-     */
-    let $button_delete_record = $container.querySelector(`.button-delete-record`);
-    let $button_copy_record = $container.querySelector(`.button-copy-record`);
-    if($button_delete_record) {
-        let selectedRows = yui_selected_rows(tabulator);
-        if (selectedRows.length && gobj_read_bool_attr(gobj, "editable")) {
-            $button_delete_record.removeAttribute("disabled");
-            $button_copy_record.removeAttribute("disabled");
-        } else {
-            $button_delete_record.setAttribute("disabled", true);
-            $button_copy_record.setAttribute("disabled", true);
-        }
-    }
-
-    render_selection_bar(gobj);
+    render_selection_state(gobj);
 
     // WARNING with radio, there is no unselect event.