@ixfx/ui 0.37.0 → 0.38.1

package/dist/src/rx/colour.d.ts

@@ -1,8 +1,8 @@
 import { type ReactiveInitial, type ReactiveNonInitial, type ReactiveWritable } from "@ixfx/rx";
-import type { HslRelative } from "@ixfx/visual/colour";
-export type ReactiveColour = ReactiveWritable<HslRelative> & {
-    setHsl: (hsl: HslRelative) => void;
+import type { HslScalar } from "@ixfx/visual/colour";
+export type ReactiveColour = ReactiveWritable<HslScalar> & {
+    setHsl: (hsl: HslScalar) => void;
 };
-export declare function colour(initialValue: HslRelative): ReactiveColour & ReactiveInitial<HslRelative>;
-export declare function colour(): ReactiveColour & ReactiveNonInitial<HslRelative>;
+export declare function colour(initialValue: HslScalar): ReactiveColour & ReactiveInitial<HslScalar>;
+export declare function colour(): ReactiveColour & ReactiveNonInitial<HslScalar>;
 //# sourceMappingURL=colour.d.ts.map

package/dist/src/rx/colour.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"colour.d.ts","sourceRoot":"","sources":["../../../src/rx/colour.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,kBAAkB,EAAE,KAAK,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5G,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,MAAM,MAAM,cAAc,GAAG,gBAAgB,CAAC,WAAW,CAAC,GAAG;IAC3D,MAAM,EAAE,CAAC,GAAG,EAAE,WAAW,KAAK,IAAI,CAAC;CACpC,CAAA;AAED,wBAAgB,MAAM,CAAC,YAAY,EAAE,WAAW,GAAG,cAAc,GAAG,eAAe,CAAC,WAAW,CAAC,CAAC;AACjG,wBAAgB,MAAM,IAAI,cAAc,GAAG,kBAAkB,CAAC,WAAW,CAAC,CAAC"}
+{"version":3,"file":"colour.d.ts","sourceRoot":"","sources":["../../../src/rx/colour.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,KAAK,eAAe,EAAE,KAAK,kBAAkB,EAAE,KAAK,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5G,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,MAAM,cAAc,GAAG,gBAAgB,CAAC,SAAS,CAAC,GAAG;IACzD,MAAM,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,CAAC;CAClC,CAAA;AAED,wBAAgB,MAAM,CAAC,YAAY,EAAE,SAAS,GAAG,cAAc,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC;AAC7F,wBAAgB,MAAM,IAAI,cAAc,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC"}

package/dist/src/rx/dom-source.d.ts

@@ -14,7 +14,7 @@ import { Colour } from "@ixfx/visual";
  * @returns
  */
 export declare function domNumberInputValue(targetOrQuery: HTMLInputElement | string, options?: Partial<DomNumberInputValueOptions>): ReactiveInitial<number> & ReactiveWritable<number>;
-export declare function domHslInputValue(targetOrQuery: HTMLInputElement | string, options?: Partial<DomValueOptions>): ReactiveInitial<Colour.HslRelative> & Reactive<Colour.HslRelative> & ReactiveWritable<Colour.HslRelative>;
+export declare function domHslInputValue(targetOrQuery: HTMLInputElement | string, options?: Partial<DomValueOptions>): ReactiveInitial<Colour.HslScalar> & Reactive<Colour.HslScalar> & ReactiveWritable<Colour.HslScalar>;
 /**
  * A stream of values when the a HTMLInputElement changes. Eg a <input type="range">
  * ```js

package/dist/src/rx/dom-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dom-source.d.ts","sourceRoot":"","sources":["../../../src/rx/dom-source.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,0BAA0B,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAIlG,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAItC;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,gBAAgB,GAAG,MAAM,EAAE,OAAO,GAAE,OAAO,CAAC,0BAA0B,CAAM,GAAG,eAAe,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAoCnL;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,gBAAgB,GAAG,MAAM,EAAE,OAAO,GAAE,OAAO,CAAC,eAAe,CAAM,GAAG,eAAe,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC,CAoB5N;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,aAAa,CAAC,aAAa,EAAE,gBAAgB,GAAG,MAAM,EAAE,OAAO,GAAE,OAAO,CAAC,eAAe,CAAM,GAAG;IAAE,EAAE,EAAE,gBAAgB,CAAA;CAAE,GAAG,eAAe,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC,CA+E7L;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDG;AACH,wBAAgB,OAAO,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,aAAa,EAAE,eAAe,GAAG,MAAM,EAAE,OAAO,GAAE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAM,GAAG;IACzI,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAClD,EAAE,EAAE,eAAe,CAAA;CACpB,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAgK3C"}
+{"version":3,"file":"dom-source.d.ts","sourceRoot":"","sources":["../../../src/rx/dom-source.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAC5E,OAAO,KAAK,EAAE,cAAc,EAAE,0BAA0B,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAIlG,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAItC;;;;;;;;;;;GAWG;AACH,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,gBAAgB,GAAG,MAAM,EAAE,OAAO,GAAE,OAAO,CAAC,0BAA0B,CAAM,GAAG,eAAe,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAoCnL;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,gBAAgB,GAAG,MAAM,EAAE,OAAO,GAAE,OAAO,CAAC,eAAe,CAAM,GAAG,eAAe,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAC,CAoBtN;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,aAAa,CAAC,aAAa,EAAE,gBAAgB,GAAG,MAAM,EAAE,OAAO,GAAE,OAAO,CAAC,eAAe,CAAM,GAAG;IAAE,EAAE,EAAE,gBAAgB,CAAA;CAAE,GAAG,eAAe,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAAC,MAAM,CAAC,CA+E7L;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDG;AACH,wBAAgB,OAAO,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,aAAa,EAAE,eAAe,GAAG,MAAM,EAAE,OAAO,GAAE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAM,GAAG;IACzI,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IAClD,EAAE,EAAE,eAAe,CAAA;CACpB,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAiK3C"}

package/dist/src/rx/dom-source.js

@@ -53,19 +53,19 @@ export function domHslInputValue(targetOrQuery, options = {}) {
     const input = domInputValue(targetOrQuery, {
         ...options,
         upstreamFilter: (value) => {
-            return (typeof value === `object`) ? Colour.toHex(value) : value;
+            return (typeof value === `object`) ? Colour.toCssColour(value) : value;
         },
     });
     const rx = transform(input, v => {
-        return Colour.toHsl(v, true);
+        return Colour.HslSpace.fromCssScalar(v, { ensureSafe: true });
     });
     return {
         ...rx,
         last() {
-            return Colour.toHsl(input.last(), true);
+            return Colour.HslSpace.fromCssScalar(input.last(), { ensureSafe: true });
         },
         set(value) {
-            input.set(Colour.toHex(value));
+            input.set(Colour.HslSpace.toCssString(value));
         },
     };
 }
@@ -256,8 +256,8 @@ export function domForm(formElOrQuery, options = {}) {
                 entries.push([k, vBool]);
             }
             else if (typeHint === `colour`) {
-                const vRgb = Colour.toString(vString);
-                entries.push([k, Colour.toRgb(vRgb)]);
+                const vRgb = Colour.toCssColour(vString);
+                entries.push([k, Colour.SrgbSpace.fromCss8bit(vRgb)]);
             }
             else {
                 entries.push([k, v.toString()]);
@@ -304,8 +304,7 @@ export function domForm(formElOrQuery, options = {}) {
             if (el.type === `color`) {
                 if (typeof value === `object`) {
                     // Try to parse colour if value is an object
-                    //const c = Colour.resolve(value, true);
-                    value = Colour.toHex(value);
+                    value = Colour.toCssColour(value);
                 }
             }
             else if (el.type === `checkbox`) {
@@ -331,10 +330,12 @@ export function domForm(formElOrQuery, options = {}) {
             if (!hint) {
                 hint = typeof v;
                 if (hint === `object`) {
-                    const rgb = Colour.parseRgbObject(v);
-                    if (rgb.success) {
-                        hint = `colour`;
-                    }
+                    const rgb = Colour.toColour(v);
+                    hint = `colour`;
+                    // const rgb = Colour.toColour(v);
+                    // if (rgb.success) {
+                    //   hint = `colour`;
+                    // }
                 }
                 typeHints.set(name, hint);
             }

package/dist/src/rx/dom.js

@@ -3,7 +3,7 @@ import { resolveEl } from "@ixfx/dom";
 import { getPathsAndData } from "@ixfx/core/records";
 import * as Rx from "@ixfx/rx";
 import * as RxFrom from "@ixfx/rx/from";
-import { getFromKeys } from "@ixfx/core/maps";
+import { findBySomeKey as mapFindBySomeKey } from "@ixfx/core/maps";
 import { afterMatch, beforeMatch, stringSegmentsWholeToEnd, stringSegmentsWholeToFirst } from "@ixfx/core/text";
 import { QueueMutable } from "@ixfx/collections";
 /**
@@ -565,7 +565,7 @@ export const elements = (source, options) => {
         });
     }
     const findBind = (path) => {
-        const bind = getFromKeys(binds, stringSegmentsWholeToEnd(path));
+        const bind = mapFindBySomeKey(binds, stringSegmentsWholeToEnd(path));
         if (bind !== undefined)
             return bind;
         if (!path.includes(`.`))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ixfx/ui",
-  "version": "0.37.0",
+  "version": "0.38.1",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -14,11 +14,11 @@
     }
   },
   "dependencies": {
-    "@ixfx/core": "^0.37.0",
-    "@ixfx/collections": "^0.37.0",
-    "@ixfx/dom": "^0.37.0",
-    "@ixfx/visual": "^0.37.0",
-    "@ixfx/rx": "^0.37.0"
+    "@ixfx/core": "^0.39.0",
+    "@ixfx/collections": "^0.39.0",
+    "@ixfx/dom": "^0.39.0",
+    "@ixfx/visual": "^0.38.1",
+    "@ixfx/rx": "^0.38.1"
   },
   "main": "dist/src/index.js"
 }