@zag-js/slider 0.0.0-dev-20220627111117 → 0.0.0-dev-20220628115342

package/dist/index.js

@@ -72,8 +72,6 @@ var runIfFn = (v, ...a) => {
   const res = typeof v === "function" ? v(...a) : v;
   return res != null ? res : void 0;
 };
-var noop = () => {
-};
 var pipe = (...fns) => (v) => fns.reduce((a, b) => b(a), v);
 var isRef = (v) => hasProp(v, "current");
 var fallback = { pageX: 0, pageY: 0, clientX: 0, clientY: 0 };
@@ -168,7 +166,7 @@ function getNativeEvent(e) {
 }
 function observeAttributes(node, attributes, fn) {
   if (!node)
-    return noop;
+    return;
   const attrs = Array.isArray(attributes) ? attributes : [attributes];
   const win = node.ownerDocument.defaultView || window;
   const obs = new win.MutationObserver((changes) => {
@@ -206,6 +204,45 @@ function trackFieldsetDisabled(el, callback) {
   callback(fieldset.disabled);
   return observeAttributes(fieldset, ["disabled"], () => callback(fieldset.disabled));
 }
+function getElementOffset(element) {
+  let left = 0;
+  let top = 0;
+  let el = element;
+  if (el.parentNode) {
+    do {
+      left += el.offsetLeft;
+      top += el.offsetTop;
+    } while ((el = el.offsetParent) && el.nodeType < 9);
+    el = element;
+    do {
+      left -= el.scrollLeft;
+      top -= el.scrollTop;
+    } while ((el = el.parentNode) && !/body/i.test(el.nodeName));
+  }
+  return {
+    top,
+    right: innerWidth - left - element.offsetWidth,
+    bottom: innerHeight - top - element.offsetHeight,
+    left
+  };
+}
+var fallback2 = {
+  pageX: 0,
+  pageY: 0,
+  clientX: 0,
+  clientY: 0
+};
+function getEventPoint(event, type = "page") {
+  var _a, _b;
+  const point = isTouchEvent(event) ? (_b = (_a = event.touches[0]) != null ? _a : event.changedTouches[0]) != null ? _b : fallback2 : event;
+  return { x: point[`${type}X`], y: point[`${type}Y`] };
+}
+function getPointRelativeToNode(point, element) {
+  const offset = getElementOffset(element);
+  const x = point.x - offset.left;
+  const y = point.y - offset.top;
+  return { x, y };
+}
 function getDescriptor(el, options) {
   var _a;
   const { type, property } = options;
@@ -323,25 +360,6 @@ function trackPointerMove(opts) {
   return pipe(addPointerEvent(doc, "pointermove", handlePointerMove, false), addPointerEvent(doc, "pointerup", onPointerUp, false), addPointerEvent(doc, "pointercancel", onPointerUp, false), addPointerEvent(doc, "contextmenu", onPointerUp, false), disableTextSelection({ doc }));
 }
 
-// ../../utilities/rect/dist/index.mjs
-var isArray2 = (v) => Array.isArray(v);
-var isObject2 = (v) => !(v == null || typeof v !== "object" || isArray2(v));
-var hasProp2 = (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop);
-var isTouchEvent2 = (v) => isObject2(v) && hasProp2(v, "touches");
-var fallback2 = { pageX: 0, pageY: 0, clientX: 0, clientY: 0 };
-function getEventPoint(e, t = "page") {
-  const p = isTouchEvent2(e) ? e.touches[0] || e.changedTouches[0] || fallback2 : e;
-  return { x: p[`${t}X`], y: p[`${t}Y`] };
-}
-function relativeToNode(p, el) {
-  const dx = p.x - el.offsetLeft - el.clientLeft + el.scrollLeft;
-  const dy = p.y - el.offsetTop - el.clientTop + el.scrollTop;
-  return {
-    point: { x: dx, y: dy },
-    progress: { x: dx / el.offsetWidth, y: dy / el.offsetHeight }
-  };
-}
-
 // ../../utilities/number/dist/index.mjs
 var __pow2 = Math.pow;
 function round(v, t) {
@@ -575,15 +593,17 @@ var dom = __spreadProps(__spreadValues({}, styles), {
   getControlEl: (ctx) => dom.getRootNode(ctx).getElementById(dom.getControlId(ctx)),
   getInputEl: (ctx) => dom.getRootNode(ctx).getElementById(dom.getInputId(ctx)),
   getValueFromPoint(ctx, point) {
-    const control = dom.getControlEl(ctx);
-    if (!control)
+    const el = dom.getControlEl(ctx);
+    if (!el)
       return;
-    const { progress } = relativeToNode(point, control);
+    const relativePoint = getPointRelativeToNode(point, el);
+    const percentX = relativePoint.x / el.offsetWidth;
+    const percentY = relativePoint.y / el.offsetHeight;
     let percent;
     if (ctx.isHorizontal) {
-      percent = ctx.isRtl ? 1 - progress.x : progress.x;
+      percent = ctx.isRtl ? 1 - percentX : percentX;
     } else {
-      percent = 1 - progress.y;
+      percent = 1 - percentY;
     }
     return utils.fromPercent(ctx, percent);
   },
@@ -595,22 +615,12 @@ var dom = __spreadProps(__spreadValues({}, styles), {
   }
 });
 
-// ../../types/dist/index.mjs
-function createNormalizer(fn) {
-  return new Proxy({}, {
-    get() {
-      return fn;
-    }
-  });
-}
-var normalizeProp = createNormalizer((v) => v);
-
 // ../../utilities/core/dist/index.mjs
 var isLeftClick2 = (v) => v.button === 0;
 var isModifiedEvent = (v) => v.ctrlKey || v.altKey || v.metaKey;
 
 // src/slider.connect.ts
-function connect(state2, send, normalize = normalizeProp) {
+function connect(state2, send, normalize) {
   var _a, _b;
   const ariaLabel = state2.context["aria-label"];
   const ariaLabelledBy = state2.context["aria-labelledby"];

package/dist/index.mjs

@@ -48,8 +48,6 @@ var runIfFn = (v, ...a) => {
   const res = typeof v === "function" ? v(...a) : v;
   return res != null ? res : void 0;
 };
-var noop = () => {
-};
 var pipe = (...fns) => (v) => fns.reduce((a, b) => b(a), v);
 var isRef = (v) => hasProp(v, "current");
 var fallback = { pageX: 0, pageY: 0, clientX: 0, clientY: 0 };
@@ -144,7 +142,7 @@ function getNativeEvent(e) {
 }
 function observeAttributes(node, attributes, fn) {
   if (!node)
-    return noop;
+    return;
   const attrs = Array.isArray(attributes) ? attributes : [attributes];
   const win = node.ownerDocument.defaultView || window;
   const obs = new win.MutationObserver((changes) => {
@@ -182,6 +180,45 @@ function trackFieldsetDisabled(el, callback) {
   callback(fieldset.disabled);
   return observeAttributes(fieldset, ["disabled"], () => callback(fieldset.disabled));
 }
+function getElementOffset(element) {
+  let left = 0;
+  let top = 0;
+  let el = element;
+  if (el.parentNode) {
+    do {
+      left += el.offsetLeft;
+      top += el.offsetTop;
+    } while ((el = el.offsetParent) && el.nodeType < 9);
+    el = element;
+    do {
+      left -= el.scrollLeft;
+      top -= el.scrollTop;
+    } while ((el = el.parentNode) && !/body/i.test(el.nodeName));
+  }
+  return {
+    top,
+    right: innerWidth - left - element.offsetWidth,
+    bottom: innerHeight - top - element.offsetHeight,
+    left
+  };
+}
+var fallback2 = {
+  pageX: 0,
+  pageY: 0,
+  clientX: 0,
+  clientY: 0
+};
+function getEventPoint(event, type = "page") {
+  var _a, _b;
+  const point = isTouchEvent(event) ? (_b = (_a = event.touches[0]) != null ? _a : event.changedTouches[0]) != null ? _b : fallback2 : event;
+  return { x: point[`${type}X`], y: point[`${type}Y`] };
+}
+function getPointRelativeToNode(point, element) {
+  const offset = getElementOffset(element);
+  const x = point.x - offset.left;
+  const y = point.y - offset.top;
+  return { x, y };
+}
 function getDescriptor(el, options) {
   var _a;
   const { type, property } = options;
@@ -299,25 +336,6 @@ function trackPointerMove(opts) {
   return pipe(addPointerEvent(doc, "pointermove", handlePointerMove, false), addPointerEvent(doc, "pointerup", onPointerUp, false), addPointerEvent(doc, "pointercancel", onPointerUp, false), addPointerEvent(doc, "contextmenu", onPointerUp, false), disableTextSelection({ doc }));
 }
 
-// ../../utilities/rect/dist/index.mjs
-var isArray2 = (v) => Array.isArray(v);
-var isObject2 = (v) => !(v == null || typeof v !== "object" || isArray2(v));
-var hasProp2 = (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop);
-var isTouchEvent2 = (v) => isObject2(v) && hasProp2(v, "touches");
-var fallback2 = { pageX: 0, pageY: 0, clientX: 0, clientY: 0 };
-function getEventPoint(e, t = "page") {
-  const p = isTouchEvent2(e) ? e.touches[0] || e.changedTouches[0] || fallback2 : e;
-  return { x: p[`${t}X`], y: p[`${t}Y`] };
-}
-function relativeToNode(p, el) {
-  const dx = p.x - el.offsetLeft - el.clientLeft + el.scrollLeft;
-  const dy = p.y - el.offsetTop - el.clientTop + el.scrollTop;
-  return {
-    point: { x: dx, y: dy },
-    progress: { x: dx / el.offsetWidth, y: dy / el.offsetHeight }
-  };
-}
-
 // ../../utilities/number/dist/index.mjs
 var __pow2 = Math.pow;
 function round(v, t) {
@@ -551,15 +569,17 @@ var dom = __spreadProps(__spreadValues({}, styles), {
   getControlEl: (ctx) => dom.getRootNode(ctx).getElementById(dom.getControlId(ctx)),
   getInputEl: (ctx) => dom.getRootNode(ctx).getElementById(dom.getInputId(ctx)),
   getValueFromPoint(ctx, point) {
-    const control = dom.getControlEl(ctx);
-    if (!control)
+    const el = dom.getControlEl(ctx);
+    if (!el)
       return;
-    const { progress } = relativeToNode(point, control);
+    const relativePoint = getPointRelativeToNode(point, el);
+    const percentX = relativePoint.x / el.offsetWidth;
+    const percentY = relativePoint.y / el.offsetHeight;
     let percent;
     if (ctx.isHorizontal) {
-      percent = ctx.isRtl ? 1 - progress.x : progress.x;
+      percent = ctx.isRtl ? 1 - percentX : percentX;
     } else {
-      percent = 1 - progress.y;
+      percent = 1 - percentY;
     }
     return utils.fromPercent(ctx, percent);
   },
@@ -571,22 +591,12 @@ var dom = __spreadProps(__spreadValues({}, styles), {
   }
 });
 
-// ../../types/dist/index.mjs
-function createNormalizer(fn) {
-  return new Proxy({}, {
-    get() {
-      return fn;
-    }
-  });
-}
-var normalizeProp = createNormalizer((v) => v);
-
 // ../../utilities/core/dist/index.mjs
 var isLeftClick2 = (v) => v.button === 0;
 var isModifiedEvent = (v) => v.ctrlKey || v.altKey || v.metaKey;
 
 // src/slider.connect.ts
-function connect(state2, send, normalize = normalizeProp) {
+function connect(state2, send, normalize) {
   var _a, _b;
   const ariaLabel = state2.context["aria-label"];
   const ariaLabelledBy = state2.context["aria-labelledby"];

package/dist/slider.connect.d.ts

@@ -1,6 +1,6 @@
-import { PropTypes, ReactPropTypes } from "@zag-js/types";
+import type { NormalizeProps, PropTypes } from "@zag-js/types";
 import type { Send, State } from "./slider.types";
-export declare function connect<T extends PropTypes = ReactPropTypes>(state: State, send: Send, normalize?: import("@zag-js/types").NormalizeProps): {
+export declare function connect<T extends PropTypes>(state: State, send: Send, normalize: NormalizeProps<T>): {
     isFocused: boolean;
     isDragging: boolean;
     value: number;

package/dist/slider.dom.d.ts

@@ -1,5 +1,4 @@
-import type { Point } from "@zag-js/rect-utils";
-import type { MachineContext as Ctx } from "./slider.types";
+import type { MachineContext as Ctx, Point } from "./slider.types";
 export declare const dom: {
     getDoc: (ctx: Ctx) => Document;
     getRootNode: (ctx: Ctx) => Document | ShadowRoot;
@@ -19,12 +18,12 @@ export declare const dom: {
     getValueFromPoint(ctx: Ctx, point: Point): number | undefined;
     dispatchChangeEvent(ctx: Ctx): void;
     getThumbOffset: (ctx: import("./slider.types").SharedContext) => string;
-    getControlStyle: () => import("@zag-js/types").Style;
-    getThumbStyle: (ctx: import("./slider.types").SharedContext) => import("@zag-js/types").Style;
-    getRangeStyle: (ctx: Pick<import("./slider.types").SharedContext, "isVertical" | "isRtl">) => import("@zag-js/types").Style;
-    getRootStyle: (ctx: Ctx) => import("@zag-js/types").Style;
-    getMarkerStyle: (ctx: Pick<import("./slider.types").SharedContext, "isHorizontal" | "isRtl">, percent: number) => import("@zag-js/types").Style;
-    getLabelStyle: () => import("@zag-js/types").Style;
-    getTrackStyle: () => import("@zag-js/types").Style;
-    getMarkerGroupStyle: () => import("@zag-js/types").Style;
+    getControlStyle: () => JSX.CSSProperties;
+    getThumbStyle: (ctx: import("./slider.types").SharedContext) => JSX.CSSProperties;
+    getRangeStyle: (ctx: Pick<import("./slider.types").SharedContext, "isVertical" | "isRtl">) => JSX.CSSProperties;
+    getRootStyle: (ctx: Ctx) => JSX.CSSProperties;
+    getMarkerStyle: (ctx: Pick<import("./slider.types").SharedContext, "isHorizontal" | "isRtl">, percent: number) => JSX.CSSProperties;
+    getLabelStyle: () => JSX.CSSProperties;
+    getTrackStyle: () => JSX.CSSProperties;
+    getMarkerGroupStyle: () => JSX.CSSProperties;
 };

package/dist/slider.types.d.ts

@@ -166,4 +166,8 @@ export declare type SharedContext = {
     orientation?: "horizontal" | "vertical";
     readonly hasMeasuredThumbSize: boolean;
 };
+export declare type Point = {
+    x: number;
+    y: number;
+};
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zag-js/slider",
-  "version": "0.0.0-dev-20220627111117",
+  "version": "0.0.0-dev-20220628115342",
   "description": "Core logic for the slider widget implemented as a state machine",
   "keywords": [
     "js",
@@ -29,11 +29,10 @@
     "url": "https://github.com/chakra-ui/zag/issues"
   },
   "dependencies": {
-    "@zag-js/core": "0.0.0-dev-20220627111117",
-    "@zag-js/dom-utils": "0.0.0-dev-20220627111117",
+    "@zag-js/core": "0.0.0-dev-20220628115342",
+    "@zag-js/dom-utils": "0.0.0-dev-20220628115342",
     "@zag-js/number-utils": "0.1.2",
-    "@zag-js/rect-utils": "0.1.2",
-    "@zag-js/types": "0.2.0",
+    "@zag-js/types": "0.0.0-dev-20220628115342",
     "@zag-js/utils": "0.1.2"
   },
   "scripts": {