cx 26.1.2 → 26.1.4

package/src/util/scss/calc.scss

@@ -1,45 +1,45 @@
-@use "sass:list";
-@use "sass:map";
-@use "sass:math";
-
-@function cx-calc($lengths...) {
-   $units: ();
-
-   @each $l in $lengths {
-      $unit: math.unit($l);
-      @if (map.has-key($units, $unit)) {
-         $nl: map.get($units, $unit) + $l;
-         $units: map.merge($units, ($unit: $nl))
-      } @else {
-         $units: map.merge($units, ($unit: $l))
-      }
-   }
-
-   $keys: map.keys($units);
-   @if (list.length($keys) == 1) {
-      @return map.get($units, list.nth($keys, 1));
-   }
-
-   $calc: '';
-   $count: 0;
-
-   @each $u, $v in $units {
-      @if ($v != 0) {
-         $count: $count + 1;
-         @if ($count > 1) {
-            $calc: $calc + ' + ';
-         }
-         $calc: $calc + $v;
-      }
-   }
-
-   @if ($count == 0) {
-      @return 0;
-   }
-
-   @if ($count == 1) {
-      @return #{$calc};
-   }
-
-   @return #{'calc(' + $calc  + ')'};
+@use "sass:list";
+@use "sass:map";
+@use "sass:math";
+
+@function cx-calc($lengths...) {
+   $units: ();
+
+   @each $l in $lengths {
+      $unit: math.unit($l);
+      @if (map.has-key($units, $unit)) {
+         $nl: map.get($units, $unit) + $l;
+         $units: map.merge($units, ($unit: $nl))
+      } @else {
+         $units: map.merge($units, ($unit: $l))
+      }
+   }
+
+   $keys: map.keys($units);
+   @if (list.length($keys) == 1) {
+      @return map.get($units, list.nth($keys, 1));
+   }
+
+   $calc: '';
+   $count: 0;
+
+   @each $u, $v in $units {
+      @if ($v != 0) {
+         $count: $count + 1;
+         @if ($count > 1) {
+            $calc: $calc + ' + ';
+         }
+         $calc: $calc + $v;
+      }
+   }
+
+   @if ($count == 0) {
+      @return 0;
+   }
+
+   @if ($count == 1) {
+      @return #{$calc};
+   }
+
+   @return #{'calc(' + $calc  + ')'};
 }

package/src/util/scss/call-once.scss

@@ -1,13 +1,13 @@
-@use "sass:map";
-
-$cx-call-once-data: () !default;
-
-@function cx-call-once($name) {
-   $result: map.get($cx-call-once-data, $name);
-   $cx-call-once-data: map.merge($cx-call-once-data, ($name: true)) !global;
-   @return $result != true;
-}
-
-@function cx-called-once($name) {
-   @return map.get($cx-call-once-data, $name);
+@use "sass:map";
+
+$cx-call-once-data: () !default;
+
+@function cx-call-once($name) {
+   $result: map.get($cx-call-once-data, $name);
+   $cx-call-once-data: map.merge($cx-call-once-data, ($name: true)) !global;
+   @return $result != true;
+}
+
+@function cx-called-once($name) {
+   @return map.get($cx-call-once-data, $name);
 }

package/src/util/scss/clockwise.scss

@@ -1,49 +1,49 @@
-@use "sass:list";
-
-@function cx-top($list) {
-   @if (list.length($list) > 0) {
-      @return list.nth($list, 1);
-   }
-   @return null;
-}
-
-@function cx-right($list) {
-   @if (list.length($list) == 1) {
-      @return list.nth($list, 1);
-   }
-   @if (list.length($list) > 1) {
-      @return list.nth($list, 2);
-   }
-   @return null;
-}
-
-@function cx-bottom($list) {
-   @if (list.length($list) > 2) {
-      @return list.nth($list, 3);
-   }
-
-   @if (list.length($list) >= 1) {
-      @return list.nth($list, 1);
-   }
-
-   @return null;
-}
-
-@function cx-left($list) {
-   @if (list.length($list) == 1) {
-      @return list.nth($list, 1);
-   }
-
-   @if (list.length($list) == 2) {
-      @return list.nth($list, 2);
-   }
-
-   @if (list.length($list) == 3) {
-      @return list.nth($list, 2);
-   }
-
-   @if (list.length($list) == 4) {
-      @return list.nth($list, 4);
-   }
-   @return null;
-}
+@use "sass:list";
+
+@function cx-top($list) {
+   @if (list.length($list) > 0) {
+      @return list.nth($list, 1);
+   }
+   @return null;
+}
+
+@function cx-right($list) {
+   @if (list.length($list) == 1) {
+      @return list.nth($list, 1);
+   }
+   @if (list.length($list) > 1) {
+      @return list.nth($list, 2);
+   }
+   @return null;
+}
+
+@function cx-bottom($list) {
+   @if (list.length($list) > 2) {
+      @return list.nth($list, 3);
+   }
+
+   @if (list.length($list) >= 1) {
+      @return list.nth($list, 1);
+   }
+
+   @return null;
+}
+
+@function cx-left($list) {
+   @if (list.length($list) == 1) {
+      @return list.nth($list, 1);
+   }
+
+   @if (list.length($list) == 2) {
+      @return list.nth($list, 2);
+   }
+
+   @if (list.length($list) == 3) {
+      @return list.nth($list, 2);
+   }
+
+   @if (list.length($list) == 4) {
+      @return list.nth($list, 4);
+   }
+   @return null;
+}

package/src/util/scss/colors.scss

@@ -1,10 +1,10 @@
-
-@use "sass:color";
-
-@function cx-whiten($color, $percentage) {
-   @return color.mix(white, $color, $percentage);
-}
-
-@function cx-blacken($color, $percentage) {
-   @return color.mix(black, $color, $percentage);
+
+@use "sass:color";
+
+@function cx-whiten($color, $percentage) {
+   @return color.mix(white, $color, $percentage);
+}
+
+@function cx-blacken($color, $percentage) {
+   @return color.mix(black, $color, $percentage);
 }

package/src/util/scss/deep-get.scss

@@ -1,12 +1,12 @@
-@use "sass:map";
-
-@function cx-map-deep-get($map, $keys...){
-   @each $key in $keys {
-      $map: map.get($map, $key)
-   }
-   @if $map != null {
-      @return $map
-   } @else {
-      @return null
-   }
+@use "sass:map";
+
+@function cx-map-deep-get($map, $keys...){
+   @each $key in $keys {
+      $map: map.get($map, $key)
+   }
+   @if $map != null {
+      @return $map
+   } @else {
+      @return null
+   }
 };

package/src/util/scss/deep-merge.scss

@@ -1,21 +1,21 @@
-@use "sass:map";
-@use "sass:meta";
-
-@function cx-deep-map-merge($parent-map, $child-map) {
-	$result: $parent-map;
-	@each $key, $value in $child-map {
-		//If the parent map does not have the child map's key, or
-		//If their type don't match, or
-		//If they are not both maps,
-		@if (not map.has-key($result, $key)) or (meta.type-of(map.get($result, $key)) != meta.type-of($value)) or (not (meta.type-of(map.get($result, $key)) == map and meta.type-of($value) == map)) {
-			//Simply add that key to the parent map.
-			$result: map.merge($result, ($key: $value));
-		}
-		@else {
-			//If they are both maps, we need another non-destructive merger.
-			//Recursive, yay!
-			$result: map.merge($result, ($key: cx-deep-map-merge(map.get($result, $key), $value)));
-		}
-	}
-	@return $result;
-}
+@use "sass:map";
+@use "sass:meta";
+
+@function cx-deep-map-merge($parent-map, $child-map) {
+	$result: $parent-map;
+	@each $key, $value in $child-map {
+		//If the parent map does not have the child map's key, or
+		//If their type don't match, or
+		//If they are not both maps,
+		@if (not map.has-key($result, $key)) or (meta.type-of(map.get($result, $key)) != meta.type-of($value)) or (not (meta.type-of(map.get($result, $key)) == map and meta.type-of($value) == map)) {
+			//Simply add that key to the parent map.
+			$result: map.merge($result, ($key: $value));
+		}
+		@else {
+			//If they are both maps, we need another non-destructive merger.
+			//Recursive, yay!
+			$result: map.merge($result, ($key: cx-deep-map-merge(map.get($result, $key), $value)));
+		}
+	}
+	@return $result;
+}

package/src/util/scss/divide.scss

@@ -1,3 +1,3 @@
-@function cx-divide($a, $b) {
-   @return $a / $b;
-}
+@function cx-divide($a, $b) {
+   @return $a / $b;
+}

package/src/util/scss/include.scss

@@ -1,48 +1,48 @@
-@use "sass:map";
-@import "call-once";
-@import "colors";
-
-$cx-include-all: true !default;
-
-$cx-excluded: () !default;
-$cx-used: null !default;
-
-$cx-dependencies: () !default;
-
-@function cx-should-include($name, $once: true) {
-   @return (
-       (map.get($cx-excluded, $name) != true) and
-       ($cx-include-all or
-       ($cx-used != null and map.get($cx-used, $name) == true))
-   )
-   and ($once != true or cx-call-once($name));
-}
-
-@function cx-included($name) {
-   @return cx-called-once($name);
-}
-
-@function cx-widget($name) {
-   @if (map.get($cx-excluded, $name)) {
-      @return 0;
-   }
-   $cx-used: map.merge($cx-used, ($name: true)) !global;
-   $dummy: 1;
-   $deps: map.get($cx-dependencies, $name);
-   @if ($deps == null) {
-      @return 0;
-   }
-   @each $dep in $deps {
-      $dummy: cx-widget($dep);
-   }
-   @return $dummy;
-}
-
-@mixin cx-widgets($names...) {
-   $dummy: 1;
-   $cx-used: () !default !global;
-
-   @each $name in $names {
-      $dummy: cx-widget($name)
-   }
-}
+@use "sass:map";
+@import "call-once";
+@import "colors";
+
+$cx-include-all: true !default;
+
+$cx-excluded: () !default;
+$cx-used: null !default;
+
+$cx-dependencies: () !default;
+
+@function cx-should-include($name, $once: true) {
+   @return (
+       (map.get($cx-excluded, $name) != true) and
+       ($cx-include-all or
+       ($cx-used != null and map.get($cx-used, $name) == true))
+   )
+   and ($once != true or cx-call-once($name));
+}
+
+@function cx-included($name) {
+   @return cx-called-once($name);
+}
+
+@function cx-widget($name) {
+   @if (map.get($cx-excluded, $name)) {
+      @return 0;
+   }
+   $cx-used: map.merge($cx-used, ($name: true)) !global;
+   $dummy: 1;
+   $deps: map.get($cx-dependencies, $name);
+   @if ($deps == null) {
+      @return 0;
+   }
+   @each $dep in $deps {
+      $dummy: cx-widget($dep);
+   }
+   @return $dummy;
+}
+
+@mixin cx-widgets($names...) {
+   $dummy: 1;
+   $cx-used: () !default !global;
+
+   @each $name in $names {
+      $dummy: cx-widget($name)
+   }
+}

package/src/util/scss/index.scss

@@ -1,9 +1,9 @@
-@import "add-rules";
-@import "calc";
-@import "call-once";
-@import "clockwise";
-@import "colors";
-@import "deep-merge";
-@import "deep-get";
-@import "include";
-@import "divide";
+@import "add-rules";
+@import "calc";
+@import "call-once";
+@import "clockwise";
+@import "colors";
+@import "deep-merge";
+@import "deep-get";
+@import "include";
+@import "divide";

package/src/util/shallowEquals.ts

@@ -1,43 +1,43 @@
-import {isArray} from './isArray';
-
-export function shallowEquals(v1: any, v2: any): boolean {
-
-   if (v1 === v2)
-      return true;
-
-   let t1 = typeof v1,
-      t2 = typeof v2,
-      k, i;
-
-   if (t1 != t2)
-      return false;
-
-   if (v1 == null || v2 == null) //this captures undefined too
-      return false;
-
-   if (t1 == 'object') {
-
-      if (isArray(v1)) {
-         if (!isArray(v2) || v1.length != v2.length)
-            return false;
-
-         for (i = 0; i < v1.length; i++)
-            if (!shallowEquals(v1[i], v2[i]))
-               return false;
-
-         return true;
-      }
-      else {
-         for (k in v1)
-            if (v1.hasOwnProperty(k) && (!v2.hasOwnProperty(k) || v1[k] !== v2[k]))
-               return false;
-
-         for (k in v2)
-            if (v2.hasOwnProperty(k) && (!v1.hasOwnProperty(k) || v1[k] !== v2[k]))
-               return false;
-
-         return true;
-      }
-   }
-   return v1 === v2;
-}
+import {isArray} from './isArray';
+
+export function shallowEquals(v1: any, v2: any): boolean {
+
+   if (v1 === v2)
+      return true;
+
+   let t1 = typeof v1,
+      t2 = typeof v2,
+      k, i;
+
+   if (t1 != t2)
+      return false;
+
+   if (v1 == null || v2 == null) //this captures undefined too
+      return false;
+
+   if (t1 == 'object') {
+
+      if (isArray(v1)) {
+         if (!isArray(v2) || v1.length != v2.length)
+            return false;
+
+         for (i = 0; i < v1.length; i++)
+            if (!shallowEquals(v1[i], v2[i]))
+               return false;
+
+         return true;
+      }
+      else {
+         for (k in v1)
+            if (v1.hasOwnProperty(k) && (!v2.hasOwnProperty(k) || v1[k] !== v2[k]))
+               return false;
+
+         for (k in v2)
+            if (v2.hasOwnProperty(k) && (!v1.hasOwnProperty(k) || v1[k] !== v2[k]))
+               return false;
+
+         return true;
+      }
+   }
+   return v1 === v2;
+}

package/src/util/test/createTestRenderer.tsx

@@ -1,19 +1,19 @@
-/** @jsxImportSource react */
-import renderer from "react-test-renderer";
-import { act } from "react";
-import { Cx } from "../../ui/Cx";
-import { View } from "../../data/View";
-
-export async function createTestRenderer(store: View, widget: any) {
-   let result: renderer.ReactTestRenderer;
-   await act(async () => {
-      result = renderer.create(createTestWidget(store, widget));
-   });
-   return result!;
-}
-
-export function createTestWidget(store: View, widget: any) {
-   return <Cx widget={widget} store={store} subscribe immediate />;
-}
-
-export { act };
+/** @jsxImportSource react */
+import renderer from "react-test-renderer";
+import { act } from "react";
+import { Cx } from "../../ui/Cx";
+import { View } from "../../data/View";
+
+export async function createTestRenderer(store: View, widget: any) {
+   let result: renderer.ReactTestRenderer;
+   await act(async () => {
+      result = renderer.create(createTestWidget(store, widget));
+   });
+   return result!;
+}
+
+export function createTestWidget(store: View, widget: any) {
+   return <Cx widget={widget} store={store} subscribe immediate />;
+}
+
+export { act };

package/src/util/throttle.ts

@@ -1,21 +1,21 @@
-/**
- * Returns a function, that, after it is invoked, will trigger the `callback` function,
- * after the `delay` amount of milliseconds has passed. During that time, all subsequent calls are
- * ignored. All arguments are passed to the `callback` function.
- * @param callback
- * @param delay - Delay in milliseconds.
- * @returns {Function}
- */
-export function throttle<T extends (...args: any[]) => void>(callback: T, delay: number): T {
-   let timer: ReturnType<typeof setTimeout> | null;
-
-   return function (this: any, ...args: any[]) {
-      const context = this;
-
-      if (!timer)
-         timer = setTimeout(function () {
-            callback.apply(context, args);
-            timer = null;
-         }, delay);
-   } as T;
-}
+/**
+ * Returns a function, that, after it is invoked, will trigger the `callback` function,
+ * after the `delay` amount of milliseconds has passed. During that time, all subsequent calls are
+ * ignored. All arguments are passed to the `callback` function.
+ * @param callback
+ * @param delay - Delay in milliseconds.
+ * @returns {Function}
+ */
+export function throttle<T extends (...args: any[]) => void>(callback: T, delay: number): T {
+   let timer: ReturnType<typeof setTimeout> | null;
+
+   return function (this: any, ...args: any[]) {
+      const context = this;
+
+      if (!timer)
+         timer = setTimeout(function () {
+            callback.apply(context, args);
+            timer = null;
+         }, delay);
+   } as T;
+}

package/src/util/validatedDebounce.ts

@@ -1,23 +1,23 @@
-export function validatedDebounce<T extends (...args: any[]) => void>(
-   callback: T,
-   valueGetter: () => any,
-   delay: number
-): T & { reset: T } {
-   let timer: ReturnType<typeof setTimeout> | undefined;
-   let result = function (...args: Parameters<T>) {
-      clearTimeout(timer);
-      let prev = valueGetter();
-      timer = setTimeout(function () {
-         let now = valueGetter();
-         if (prev !== now) return;
-         callback(...args);
-      }, delay);
-   } as T & { reset: T };
-
-   result.reset = function reset(...args: Parameters<T>) {
-      clearTimeout(timer);
-      callback(...args);
-   } as T;
-
-   return result;
-}
+export function validatedDebounce<T extends (...args: any[]) => void>(
+   callback: T,
+   valueGetter: () => any,
+   delay: number
+): T & { reset: T } {
+   let timer: ReturnType<typeof setTimeout> | undefined;
+   let result = function (...args: Parameters<T>) {
+      clearTimeout(timer);
+      let prev = valueGetter();
+      timer = setTimeout(function () {
+         let now = valueGetter();
+         if (prev !== now) return;
+         callback(...args);
+      }, delay);
+   } as T & { reset: T };
+
+   result.reset = function reset(...args: Parameters<T>) {
+      clearTimeout(timer);
+      callback(...args);
+   } as T;
+
+   return result;
+}