wimui 0.49.0 → 0.50.1

package/dist/components/form/QueryBuilder/QueryBuilder.d.ts

@@ -71,120 +71,93 @@ export interface QueryBuilderProps {
 }
 /**
  * 演算子の語彙。**利用者が `QueryRule.operator` に渡すのは `value`（記号）**で、
- * `key` は翻訳の引き当てにしか使わない。以前は `operator: string` だったため
+ * `key` は翻訳の引き当てにしか使わない（文言は `components:query.builder.operators.<key>`。en / ja / pt）。以前は `operator: string` だったため
  * `"greater_equal"` のような語を渡すと**空の Select が黙って描画された**（T124）。
  * 型はこの表から導くので、値を足せば型も追随する（T38 と同じ形）。
  */
 declare const DEFAULT_OPERATORS: {
     readonly string: readonly [{
-        readonly label: "Equals";
         readonly value: "=";
         readonly key: "equal";
     }, {
-        readonly label: "Does not equal";
         readonly value: "!=";
         readonly key: "not_equal";
     }, {
-        readonly label: "Contains";
         readonly value: "contains";
         readonly key: "contains";
     }, {
-        readonly label: "Starts with";
         readonly value: "starts_with";
         readonly key: "starts_with";
     }, {
-        readonly label: "Ends with";
         readonly value: "ends_with";
         readonly key: "ends_with";
     }, {
-        readonly label: "Is null";
         readonly value: "is_null";
         readonly key: "is_null";
     }, {
-        readonly label: "Is not null";
         readonly value: "is_not_null";
         readonly key: "is_not_null";
     }];
     readonly number: readonly [{
-        readonly label: "Equals";
         readonly value: "=";
         readonly key: "equal";
     }, {
-        readonly label: "Does not equal";
         readonly value: "!=";
         readonly key: "not_equal";
     }, {
-        readonly label: "Greater than";
         readonly value: ">";
         readonly key: "greater_than";
     }, {
-        readonly label: "Less than";
         readonly value: "<";
         readonly key: "less_than";
     }, {
-        readonly label: "Greater than or equal";
         readonly value: ">=";
         readonly key: "greater_than_or_equal";
     }, {
-        readonly label: "Less than or equal";
         readonly value: "<=";
         readonly key: "less_than_or_equal";
     }, {
-        readonly label: "Is null";
         readonly value: "is_null";
         readonly key: "is_null";
     }, {
-        readonly label: "Is not null";
         readonly value: "is_not_null";
         readonly key: "is_not_null";
     }];
     readonly date: readonly [{
-        readonly label: "Equals";
         readonly value: "=";
         readonly key: "equal";
     }, {
-        readonly label: "Does not equal";
         readonly value: "!=";
         readonly key: "not_equal";
     }, {
-        readonly label: "After";
         readonly value: ">";
         readonly key: "after";
     }, {
-        readonly label: "Before";
         readonly value: "<";
         readonly key: "before";
     }, {
-        readonly label: "After or on";
         readonly value: ">=";
         readonly key: "after_or_on";
     }, {
-        readonly label: "Before or on";
         readonly value: "<=";
         readonly key: "before_or_on";
     }, {
-        readonly label: "Is null";
         readonly value: "is_null";
         readonly key: "is_null";
     }, {
-        readonly label: "Is not null";
         readonly value: "is_not_null";
         readonly key: "is_not_null";
     }];
     readonly boolean: readonly [{
-        readonly label: "Equals";
         readonly value: "=";
         readonly key: "equal";
     }, {
-        readonly label: "Does not equal";
         readonly value: "!=";
         readonly key: "not_equal";
     }, {
-        readonly label: "Is null";
         readonly value: "is_null";
         readonly key: "is_null";
     }, {
-        readonly label: "Is not null";
         readonly value: "is_not_null";
         readonly key: "is_not_null";
     }];

package/dist/components/form/QueryBuilder/QueryBuilder.js

@@ -17,143 +17,116 @@ import { jsx as g, jsxs as _ } from "react/jsx-runtime";
 var v = 0, y = () => typeof window < "u" && window.__VRT__ ? (v += 1, `vrt-id-${v}`) : Math.random().toString(36).substring(2, 11), b = {
 	string: [
 		{
-			label: "Equals",
 			value: "=",
 			key: "equal"
 		},
 		{
-			label: "Does not equal",
 			value: "!=",
 			key: "not_equal"
 		},
 		{
-			label: "Contains",
 			value: "contains",
 			key: "contains"
 		},
 		{
-			label: "Starts with",
 			value: "starts_with",
 			key: "starts_with"
 		},
 		{
-			label: "Ends with",
 			value: "ends_with",
 			key: "ends_with"
 		},
 		{
-			label: "Is null",
 			value: "is_null",
 			key: "is_null"
 		},
 		{
-			label: "Is not null",
 			value: "is_not_null",
 			key: "is_not_null"
 		}
 	],
 	number: [
 		{
-			label: "Equals",
 			value: "=",
 			key: "equal"
 		},
 		{
-			label: "Does not equal",
 			value: "!=",
 			key: "not_equal"
 		},
 		{
-			label: "Greater than",
 			value: ">",
 			key: "greater_than"
 		},
 		{
-			label: "Less than",
 			value: "<",
 			key: "less_than"
 		},
 		{
-			label: "Greater than or equal",
 			value: ">=",
 			key: "greater_than_or_equal"
 		},
 		{
-			label: "Less than or equal",
 			value: "<=",
 			key: "less_than_or_equal"
 		},
 		{
-			label: "Is null",
 			value: "is_null",
 			key: "is_null"
 		},
 		{
-			label: "Is not null",
 			value: "is_not_null",
 			key: "is_not_null"
 		}
 	],
 	date: [
 		{
-			label: "Equals",
 			value: "=",
 			key: "equal"
 		},
 		{
-			label: "Does not equal",
 			value: "!=",
 			key: "not_equal"
 		},
 		{
-			label: "After",
 			value: ">",
 			key: "after"
 		},
 		{
-			label: "Before",
 			value: "<",
 			key: "before"
 		},
 		{
-			label: "After or on",
 			value: ">=",
 			key: "after_or_on"
 		},
 		{
-			label: "Before or on",
 			value: "<=",
 			key: "before_or_on"
 		},
 		{
-			label: "Is null",
 			value: "is_null",
 			key: "is_null"
 		},
 		{
-			label: "Is not null",
 			value: "is_not_null",
 			key: "is_not_null"
 		}
 	],
 	boolean: [
 		{
-			label: "Equals",
 			value: "=",
 			key: "equal"
 		},
 		{
-			label: "Does not equal",
 			value: "!=",
 			key: "not_equal"
 		},
 		{
-			label: "Is null",
 			value: "is_null",
 			key: "is_null"
 		},
 		{
-			label: "Is not null",
 			value: "is_not_null",
 			key: "is_not_null"
 		}
@@ -285,7 +258,7 @@ var v = 0, y = () => typeof window < "u" && window.__VRT__ ? (v += 1, `vrt-id-${
 	}, ie = (e) => {
 		let t = v.find((t) => t.name === e.field)?.type || "string", a = b[t].map((e) => ({
 			...e,
-			label: H[e.key] || e.label
+			label: H[e.key] || E(`query.builder.operators.${e.key}`)
 		})), s = (t) => {
 			let n = v.find((e) => e.name === t);
 			Z(e.id, {

package/dist/components/form/Select/useSelect.cjs

@@ -1,2 +1,2 @@
 "use client";
-let e=require("react");function t({options:t,value:n,onChange:r,defaultValue:i,searchable:a,grouped:o,disabled:s,filterOption:c}){let[l,u]=(0,e.useState)(!1),[d,f]=(0,e.useState)(i||``),[p,m]=(0,e.useState)(``),[h,g]=(0,e.useState)(-1),[_,v]=(0,e.useState)(!1),y=(0,e.useRef)(null),b=(0,e.useRef)(null),x=(0,e.useRef)(null),S=(0,e.useRef)([]),C=n!==void 0,w=C?n:d,T=(0,e.useMemo)(()=>o&&t.length>0&&`options`in t[0]?t.flatMap(e=>e.options):t,[t,o]),E=(0,e.useMemo)(()=>{if(!p)return T;let e=c||((e,t)=>{if(e.type===`separator`)return!1;let n=typeof e.label==`string`?e.label:``,r=typeof e.value==`string`?e.value:``,i=t.toLowerCase();return n.toLowerCase().includes(i)||r.toLowerCase().includes(i)});return T.filter(t=>e(t,p))},[T,p,c]),D=T.find(e=>e.value===w);(0,e.useEffect)(()=>{let e=e=>{y.current&&!y.current.contains(e.target)&&(u(!1),m(``),g(-1))};return document.addEventListener(`mousedown`,e),()=>document.removeEventListener(`mousedown`,e)},[]),(0,e.useEffect)(()=>{l&&a&&x.current&&x.current.focus()},[l,a]),(0,e.useEffect)(()=>{h>=0&&S.current[h]&&S.current[h]?.scrollIntoView({block:`nearest`,behavior:`smooth`})},[h]);let O=()=>{s||(u(!l),l||(m(``),g(-1)))},k=e=>{e.type===`separator`||e.disabled||(!C&&e.value!==void 0&&f(e.value),r&&e.value!==void 0&&r(e.value),u(!1),m(``),g(-1),b.current?.focus())};return{isOpen:l,searchValue:p,setSearchValue:m,focusedIndex:h,setFocusedIndex:g,isKeyboardNavigating:_,setIsKeyboardNavigating:v,containerRef:y,triggerRef:b,searchInputRef:x,listItemsRef:S,currentValue:w,flatOptions:T,filteredOptions:E,selectedOption:D,focusedOption:h>=0?E[h]:null,handleToggle:O,handleSelect:k,handleClear:()=>{s||(C||f(``),r?.(``))},handleKeyDown:e=>{if(v(!0),!s)switch(e.key){case`Enter`:case` `:l?h>=0&&E[h]&&k(E[h]):u(!0),e.preventDefault();break;case`Escape`:u(!1),m(``),g(-1),b.current?.focus(),e.preventDefault();break;case`ArrowDown`:e.preventDefault(),l?g(e=>{let t=e+1;for(t>=E.length&&(t=0);t<E.length&&(E[t]?.disabled||E[t]?.type===`separator`);)t++;if(t>=E.length)for(t=0;t<e&&(E[t]?.disabled||E[t]?.type===`separator`);)t++;return t<E.length?t:e}):u(!0);break;case`ArrowUp`:e.preventDefault(),l&&g(e=>{let t=e-1;for(t<0&&(t=E.length-1);t>=0&&(E[t]?.disabled||E[t]?.type===`separator`);)t--;if(t<0)for(t=E.length-1;t>e&&(E[t]?.disabled||E[t]?.type===`separator`);)t--;return t>=0?t:e});break;case`Home`:l&&(e.preventDefault(),g(0));break;case`End`:l&&(e.preventDefault(),g(E.length-1))}}}}exports.useSelect=t;
+let e=require("react");function t({options:t,value:n,onChange:r,defaultValue:i,searchable:a,grouped:o,disabled:s,filterOption:c}){let[l,u]=(0,e.useState)(!1),[d,f]=(0,e.useState)(i||``),[p,m]=(0,e.useState)(``),[h,g]=(0,e.useState)(-1),[_,v]=(0,e.useState)(!1),y=(0,e.useRef)(null),b=(0,e.useRef)(null),x=(0,e.useRef)(null),S=(0,e.useRef)([]),C=n!==void 0,w=C?n:d,T=(0,e.useMemo)(()=>o&&t.length>0&&`options`in t[0]?t.flatMap(e=>e.options):t,[t,o]),E=(0,e.useMemo)(()=>{if(!p)return T;let e=c||((e,t)=>{if(e.type===`separator`)return!1;let n=typeof e.label==`string`?e.label:``,r=typeof e.value==`string`?e.value:``,i=t.toLowerCase();return n.toLowerCase().includes(i)||r.toLowerCase().includes(i)});return T.filter(t=>e(t,p))},[T,p,c]),D=T.find(e=>e.value===w);(0,e.useEffect)(()=>{let e=e=>{y.current&&!y.current.contains(e.target)&&(u(!1),m(``),g(-1))};return document.addEventListener(`mousedown`,e),()=>document.removeEventListener(`mousedown`,e)},[]),(0,e.useEffect)(()=>{l&&a&&x.current&&x.current.focus()},[l,a]),(0,e.useEffect)(()=>{h>=0&&S.current[h]&&S.current[h]?.scrollIntoView({block:`nearest`,behavior:`smooth`})},[h]);let O=()=>{s||(u(!l),l||(m(``),g(-1)))},k=e=>{e.type===`separator`||e.disabled||(!C&&e.value!==void 0&&f(e.value),r&&e.value!==void 0&&r(e.value),u(!1),m(``),g(-1),b.current?.focus())};return{isOpen:l,searchValue:p,setSearchValue:m,focusedIndex:h,setFocusedIndex:g,isKeyboardNavigating:_,setIsKeyboardNavigating:v,containerRef:y,triggerRef:b,searchInputRef:x,listItemsRef:S,currentValue:w,flatOptions:T,filteredOptions:E,selectedOption:D,focusedOption:h>=0?E[h]:null,handleToggle:O,handleSelect:k,handleClear:()=>{s||(C||f(``),r?.(``))},handleKeyDown:e=>{if(v(!0),!s)switch(e.key){case`Enter`:case` `:l?h>=0&&E[h]&&k(E[h]):u(!0),e.preventDefault();break;case`Escape`:u(!1),m(``),g(-1),b.current?.focus(),e.preventDefault();break;case`Tab`:l&&(u(!1),m(``),g(-1));break;case`ArrowDown`:e.preventDefault(),l?g(e=>{let t=e+1;for(t>=E.length&&(t=0);t<E.length&&(E[t]?.disabled||E[t]?.type===`separator`);)t++;if(t>=E.length)for(t=0;t<e&&(E[t]?.disabled||E[t]?.type===`separator`);)t++;return t<E.length?t:e}):u(!0);break;case`ArrowUp`:e.preventDefault(),l&&g(e=>{let t=e-1;for(t<0&&(t=E.length-1);t>=0&&(E[t]?.disabled||E[t]?.type===`separator`);)t--;if(t<0)for(t=E.length-1;t>e&&(E[t]?.disabled||E[t]?.type===`separator`);)t--;return t>=0?t:e});break;case`Home`:l&&(e.preventDefault(),g(0));break;case`End`:l&&(e.preventDefault(),g(E.length-1))}}}}exports.useSelect=t;

package/dist/components/form/Select/useSelect.js

@@ -64,6 +64,9 @@ function i({ options: i, value: a, onChange: o, defaultValue: s, searchable: c,
 				case "Escape":
 					p(!1), _(""), y(-1), C.current?.focus(), e.preventDefault();
 					break;
+				case "Tab":
+					f && (p(!1), _(""), y(-1));
+					break;
 				case "ArrowDown":
 					e.preventDefault(), f ? y((e) => {
 						let t = e + 1;

package/dist/components/overlay/FocusTrap/FocusTrap.cjs

@@ -1,2 +1,2 @@
 "use client";
-const e=require("../../../_virtual/_rolldown/runtime.cjs"),t=require("./focus-trap.module.cjs");let n=require("react");n=e.__toESM(n,1);let r=require("classnames");r=e.__toESM(r,1);let i=require("react/jsx-runtime");var a=({children:e,active:a=!0,initialFocus:o=!0,className:s})=>{let c=(0,n.useRef)(null),l=(0,n.useRef)(null);return(0,n.useEffect)(()=>{if(!a)return;l.current=document.activeElement;let e=c.current;if(!e)return;let t=()=>Array.from(e.querySelectorAll(`button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])`)).filter(e=>{let t=window.getComputedStyle(e);return t.display!==`none`&&t.visibility!==`hidden`&&!e.disabled});if(o){let e=t();e.length>0&&e[0].focus()}let n=e=>{if(e.key!==`Tab`)return;let n=t();if(n.length===0){e.preventDefault();return}let r=n[0],i=n[n.length-1];e.shiftKey?document.activeElement===r&&(e.preventDefault(),i.focus()):document.activeElement===i&&(e.preventDefault(),r.focus())};return document.addEventListener(`keydown`,n),()=>{document.removeEventListener(`keydown`,n),l.current&&l.current.focus()}},[a,o]),(0,i.jsx)(`div`,{ref:c,className:(0,r.default)(`wim-focus-trap`,t.default.root,s),children:e})};exports.FocusTrap=a;
+const e=require("../../../_virtual/_rolldown/runtime.cjs"),t=require("./focus-trap.module.cjs");let n=require("react");n=e.__toESM(n,1);let r=require("classnames");r=e.__toESM(r,1);let i=require("react/jsx-runtime");var a=({children:e,active:a=!0,initialFocus:o=!0,className:s})=>{let c=(0,n.useRef)(null),l=(0,n.useRef)(null);return(0,n.useEffect)(()=>{if(!a)return;l.current=document.activeElement;let e=c.current;if(!e)return;let t=()=>Array.from(e.querySelectorAll(`button, [href], input, select, textarea, [tabindex]:not([tabindex="-1"])`)).filter(e=>{let t=window.getComputedStyle(e);return e.tabIndex>=0&&t.display!==`none`&&t.visibility!==`hidden`&&!e.disabled});if(o){let e=t();e.length>0&&e[0].focus()}let n=n=>{if(n.key!==`Tab`)return;let r=t();if(r.length===0){n.preventDefault();return}let i=r[0],a=r[r.length-1],o=document.activeElement;if(!o||!e.contains(o))return;let s=r.indexOf(o);n.shiftKey?(s>=0?s>0:r.some(e=>e.compareDocumentPosition(o)&Node.DOCUMENT_POSITION_FOLLOWING))||(n.preventDefault(),a.focus()):(s>=0?s<r.length-1:r.some(e=>o.compareDocumentPosition(e)&Node.DOCUMENT_POSITION_FOLLOWING))||(n.preventDefault(),i.focus())};return document.addEventListener(`keydown`,n),()=>{document.removeEventListener(`keydown`,n),l.current&&l.current.focus()}},[a,o]),(0,i.jsx)(`div`,{ref:c,className:(0,r.default)(`wim-focus-trap`,t.default.root,s),children:e})};exports.FocusTrap=a;

package/dist/components/overlay/FocusTrap/FocusTrap.js

@@ -13,21 +13,23 @@ var a = ({ children: a, active: o = !0, initialFocus: s = !0, className: c }) =>
 		if (!e) return;
 		let t = () => Array.from(e.querySelectorAll("button, [href], input, select, textarea, [tabindex]:not([tabindex=\"-1\"])")).filter((e) => {
 			let t = window.getComputedStyle(e);
-			return t.display !== "none" && t.visibility !== "hidden" && !e.disabled;
+			return e.tabIndex >= 0 && t.display !== "none" && t.visibility !== "hidden" && !e.disabled;
 		});
 		if (s) {
 			let e = t();
 			e.length > 0 && e[0].focus();
 		}
-		let n = (e) => {
-			if (e.key !== "Tab") return;
-			let n = t();
-			if (n.length === 0) {
-				e.preventDefault();
+		let n = (n) => {
+			if (n.key !== "Tab") return;
+			let r = t();
+			if (r.length === 0) {
+				n.preventDefault();
 				return;
 			}
-			let r = n[0], i = n[n.length - 1];
-			e.shiftKey ? document.activeElement === r && (e.preventDefault(), i.focus()) : document.activeElement === i && (e.preventDefault(), r.focus());
+			let i = r[0], a = r[r.length - 1], o = document.activeElement;
+			if (!o || !e.contains(o)) return;
+			let s = r.indexOf(o);
+			n.shiftKey ? (s >= 0 ? s > 0 : r.some((e) => e.compareDocumentPosition(o) & Node.DOCUMENT_POSITION_FOLLOWING)) || (n.preventDefault(), a.focus()) : (s >= 0 ? s < r.length - 1 : r.some((e) => o.compareDocumentPosition(e) & Node.DOCUMENT_POSITION_FOLLOWING)) || (n.preventDefault(), i.focus());
 		};
 		return document.addEventListener("keydown", n), () => {
 			document.removeEventListener("keydown", n), u.current && u.current.focus();