@yuneta/gobj-ui 7.23.60 → 7.23.63

package/dist/gobj-ui.cjs.js

@@ -6035,6 +6035,7 @@ function yui_file_control(gobj, { name, value, readonly, accept, on_pick }) {
 		accept: accept || YUI_FILE_ACCEPT,
 		hidden: ""
 	}]);
+	if (readonly) $input.disabled = true;
 	const $pick = (0, _yuneta_gobj_js.createElement2)([
 		"button",
 		{
@@ -6083,6 +6084,7 @@ function yui_file_control(gobj, { name, value, readonly, accept, on_pick }) {
 		const picked = $control.yui_file;
 		const kept = $control.yui_file_value;
 		$name.textContent = picked ? picked.name || "" : yui_file_id_label(kept);
+		$name.title = picked ? picked.name || "" : kept || "";
 		$size.textContent = picked ? yui_file_size_label(picked.size) : "";
 		$state.className = "FILE_STATE";
 		$state.removeAttribute("data-i18n");
@@ -7999,6 +8001,12 @@ function apply_readonly_to_control(readonly, tag, inputType, $extend) {
 		case "jsoneditor":
 			$extend.classList.add("yui-jse-readonly");
 			break;
+		case "file":
+			{
+				const $picker = $extend.querySelector(".FILE_INPUT");
+				if ($picker) $picker.disabled = true;
+			}
+			break;
 		case "input": if (inputType === "color") $extend.setAttribute("disabled", "disabled");
 	}
 }
@@ -8641,6 +8649,7 @@ function treedb_value_2_form_value(gobj, field_desc, value) {
 		return { json: (0, _yuneta_gobj_js.is_object)(value) || (0, _yuneta_gobj_js.is_array)(value) ? value : {} };
 	}
 	switch (type) {
+		case "file": return value;
 		case "fkey": {
 			let new_value = [];
 			if ((0, _yuneta_gobj_js.is_string)(value) && !(0, _yuneta_gobj_js.empty_string)(value)) {
@@ -8737,6 +8746,7 @@ function form_value_2_treedb_value(gobj, field_desc, value) {
 		return value;
 	}
 	switch (type) {
+		case "file": break;
 		case "fkey":
 			value = build_fkey_ref$1(gobj, field_desc, value);
 			break;
@@ -25338,7 +25348,7 @@ function transform__form_record_2_treedb_record(gobj, kw, operation) {
 		let col = get_schema_col(gobj, field_name);
 		if (!col) continue;
 		const field_desc = (0, _yuneta_gobj_js.treedb_get_field_desc)(col);
-		if (!field_desc.is_writable && field_desc.type !== "fkey" && col.id !== pkey) continue;
+		if (!field_desc.is_writable && field_desc.type !== "fkey" && !field_desc.is_file && col.id !== pkey) continue;
 		let value = kw[field_name];
 		row[field_name] = transform__form_value_2_treedb_value(gobj, col, value, operation);
 	}

package/dist/gobj-ui.es.js

@@ -6030,6 +6030,7 @@ function yui_file_control(gobj, { name, value, readonly, accept, on_pick }) {
 		accept: accept || YUI_FILE_ACCEPT,
 		hidden: ""
 	}]);
+	if (readonly) $input.disabled = true;
 	const $pick = createElement2([
 		"button",
 		{
@@ -6078,6 +6079,7 @@ function yui_file_control(gobj, { name, value, readonly, accept, on_pick }) {
 		const picked = $control.yui_file;
 		const kept = $control.yui_file_value;
 		$name.textContent = picked ? picked.name || "" : yui_file_id_label(kept);
+		$name.title = picked ? picked.name || "" : kept || "";
 		$size.textContent = picked ? yui_file_size_label(picked.size) : "";
 		$state.className = "FILE_STATE";
 		$state.removeAttribute("data-i18n");
@@ -7994,6 +7996,12 @@ function apply_readonly_to_control(readonly, tag, inputType, $extend) {
 		case "jsoneditor":
 			$extend.classList.add("yui-jse-readonly");
 			break;
+		case "file":
+			{
+				const $picker = $extend.querySelector(".FILE_INPUT");
+				if ($picker) $picker.disabled = true;
+			}
+			break;
 		case "input": if (inputType === "color") $extend.setAttribute("disabled", "disabled");
 	}
 }
@@ -8636,6 +8644,7 @@ function treedb_value_2_form_value(gobj, field_desc, value) {
 		return { json: is_object(value) || is_array(value) ? value : {} };
 	}
 	switch (type) {
+		case "file": return value;
 		case "fkey": {
 			let new_value = [];
 			if (is_string(value) && !empty_string(value)) {
@@ -8732,6 +8741,7 @@ function form_value_2_treedb_value(gobj, field_desc, value) {
 		return value;
 	}
 	switch (type) {
+		case "file": break;
 		case "fkey":
 			value = build_fkey_ref$1(gobj, field_desc, value);
 			break;
@@ -25333,7 +25343,7 @@ function transform__form_record_2_treedb_record(gobj, kw, operation) {
 		let col = get_schema_col(gobj, field_name);
 		if (!col) continue;
 		const field_desc = treedb_get_field_desc(col);
-		if (!field_desc.is_writable && field_desc.type !== "fkey" && col.id !== pkey) continue;
+		if (!field_desc.is_writable && field_desc.type !== "fkey" && !field_desc.is_file && col.id !== pkey) continue;
 		let value = kw[field_name];
 		row[field_name] = transform__form_value_2_treedb_value(gobj, col, value, operation);
 	}

package/package.json

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

package/src/c_yui_form.js

@@ -1578,6 +1578,17 @@ function apply_readonly_to_control(readonly, tag, inputType, $extend)
              *  `input` has done since it existed.  */
             $extend.classList.add('yui-jse-readonly');
             break;
+        case 'file':
+            /*  The button is hidden by the control itself; this is the
+             *  INPUT, which stays in the DOM and would otherwise report a
+             *  read-only form as writable.  */
+            {
+                const $picker = $extend.querySelector('.FILE_INPUT');
+                if($picker) {
+                    $picker.disabled = true;
+                }
+            }
+            break;
         case 'input':
             /*  `readonly` does not apply to a colour input -- the spec lists
              *  the types it applies to and colour is not one of them -- so
@@ -2654,6 +2665,14 @@ function treedb_value_2_form_value(gobj, field_desc, value)
     }
 
     switch(type) {
+        /*  A `file` column is handed to the control AS IT COMES: the
+         *  control reads the fkey itself (yui_asset_id knows the three
+         *  shapes a link comes back in), and converting it here would be
+         *  reading it twice, in two places, with two ideas of what a link
+         *  looks like.  */
+        case "file":
+            return value;
+
         case "fkey": {
             /*  Decode ref(s) ("topic^id^hook", bare "$id", dict keys or
              *  {topic_name,id,hook_name}) into a plain array of ids for
@@ -2804,6 +2823,13 @@ function form_value_2_treedb_value(gobj, field_desc, value)
     }
 
     switch(type) {
+        /*  The BARE id, and treedb expands it into the full reference
+         *  (`__assets__^<sha>^as_<T>_<C>`). That is the whole point of the
+         *  host declaring nothing but the column: the client never has to
+         *  learn the name of a hook that is DERIVED.  */
+        case "file":
+            break;
+
         case "fkey":
             value = build_fkey_ref(gobj, field_desc, value);
             break;

package/src/c_yui_treedb_topic_with_form.js

@@ -2620,7 +2620,14 @@ function transform__form_record_2_treedb_record(gobj, kw, operation)
          */
         const field_desc = treedb_get_field_desc(col);
         if(!field_desc.is_writable &&
-                field_desc.type !== "fkey" && col.id !== pkey) {
+                field_desc.type !== "fkey" && !field_desc.is_file &&
+                col.id !== pkey) {
+            /*  `is_file` and not the type: a `file` column IS an fkey (it
+             *  is flagged ['fkey','file']) but answers `type: "file"`, and
+             *  the write goes out with `autolink`, which rebuilds the links
+             *  from what the record carries. Dropped here, a read-only
+             *  `file` column -- the one only a load fills -- was UNLINKED
+             *  by every save of any other field of its record.  */
             continue;
         }
 

package/src/yui_file_field.js

@@ -245,6 +245,17 @@ function yui_file_control(gobj, {name, value, readonly, accept, on_pick})
         accept: accept || YUI_FILE_ACCEPT,
         hidden: ""
     }]);
+    /*
+     *  A read-only form must not merely LOOK read-only. Hiding the button
+     *  hides the way in for a person and leaves the input enabled, so the
+     *  DOM still says the field is writable -- which is what anything
+     *  reading the form programmatically believes, and what a form opened
+     *  by a click to READ must not say. `disabled` and not `readonly`: the
+     *  spec does not list `file` among the types `readonly` applies to.
+     */
+    if(readonly) {
+        $input.disabled = true;
+    }
 
     const $pick = createElement2(["button", {
         type: "button",
@@ -289,6 +300,10 @@ function yui_file_control(gobj, {name, value, readonly, accept, on_pick})
         const kept = $control.yui_file_value;
 
         $name.textContent = picked? (picked.name || ""): yui_file_id_label(kept);
+        /*  The shortened id is unusable on its own -- it cannot be looked
+         *  up, pasted or compared. The whole of it belongs in the tooltip,
+         *  which is also where the full NAME of a long picked file goes.  */
+        $name.title = picked? (picked.name || ""): (kept || "");
         $size.textContent = picked? yui_file_size_label(picked.size): "";
 
         $state.className = "FILE_STATE";