@tamagui/progress 3.0.0-beta.1351.1 → 3.0.0-beta.1356.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (17) hide show
  1. package/dist/cjs/Progress.cjs +24 -8
  2. package/dist/cjs/Progress.native.cjs +24 -8
  3. package/dist/cjs/Progress.native.js +24 -8
  4. package/dist/cjs/Progress.native.js.map +1 -1
  5. package/dist/esm/Progress.mjs +24 -8
  6. package/dist/esm/Progress.mjs.map +1 -1
  7. package/dist/esm/Progress.native.js +24 -8
  8. package/dist/esm/Progress.native.js.map +1 -1
  9. package/dist/jsx/Progress.mjs +24 -8
  10. package/dist/jsx/Progress.mjs.map +1 -1
  11. package/dist/jsx/Progress.native.cjs +24 -8
  12. package/dist/jsx/Progress.native.js +24 -8
  13. package/dist/jsx/Progress.native.js.map +1 -1
  14. package/package.json +8 -8
  15. package/src/Progress.tsx +48 -9
  16. package/types/Progress.d.ts +15 -14
  17. package/types/Progress.d.ts.map +1 -1
package/dist/cjs/Progress.cjs CHANGED
@@ -82,17 +82,33 @@ function isValidValueNumber(value, max) {
82
82
  return isNumber(value) && !Number.isNaN(value) && value <= max && value >= 0;
83
83
  }
84
84
  const DEFAULT_MAX = 100;
85
+ const progressTrackHeight = {
86
+ xs: 4,
87
+ sm: 6,
88
+ md: 9,
89
+ lg: 12,
90
+ xl: 16
91
+ };
92
+ const resolveProgressSize = (val) => {
93
+ if (typeof val === "string" && val in progressTrackHeight) {
94
+ return progressTrackHeight[val];
95
+ }
96
+ const resolved = Number((0, import_core.getVariableValue)((0, import_get_token.getSize)(val === true ? 36 : val)));
97
+ const base = Number.isFinite(resolved) ? resolved : Number((0, import_core.getVariableValue)((0, import_get_token.getSize)(36)));
98
+ return Math.round(base * .25);
99
+ };
100
+ const getProgressSize = import_core.styled.dynamic((val) => {
101
+ const size = resolveProgressSize(val);
102
+ return {
103
+ height: size,
104
+ minWidth: size * 20,
105
+ width: "100%"
106
+ };
107
+ });
85
108
  const ProgressFrame = (0, import_core.styled)(import_stacks.YStack, {
86
109
  displayName: "Progress",
87
110
  overflow: "hidden",
88
- variants: { size: import_core.styled.dynamic((val) => {
89
- const size = Math.round((0, import_core.getVariableValue)((0, import_get_token.getSize)(val === true ? 36 : val)) * .25);
90
- return {
91
- height: size,
92
- minWidth: (0, import_core.getVariableValue)(size) * 20,
93
- width: "100%"
94
- };
95
- }) }
111
+ variants: { size: getProgressSize }
96
112
  });
97
113
  const Progress = (0, import_helpers.withStaticProperties)((0, import_core.createStyledHOC)(ProgressFrame, function Progress2(props, forwardedRef) {
98
114
  const { __scopeProgress, value: valueProp, max: maxProp, getValueLabel = defaultGetValueLabel, size = true, ...progressProps } = props;
package/dist/cjs/Progress.native.cjs CHANGED
@@ -86,17 +86,33 @@ function isValidValueNumber(value, max) {
86
86
  return isNumber(value) && !Number.isNaN(value) && value <= max && value >= 0;
87
87
  }
88
88
  var DEFAULT_MAX = 100;
89
+ var progressTrackHeight = {
90
+ xs: 4,
91
+ sm: 6,
92
+ md: 9,
93
+ lg: 12,
94
+ xl: 16
95
+ };
96
+ var resolveProgressSize = function(val) {
97
+ if (typeof val === "string" && val in progressTrackHeight) {
98
+ return progressTrackHeight[val];
99
+ }
100
+ var resolved = Number((0, import_core.getVariableValue)((0, import_get_token.getSize)(val === true ? 36 : val)));
101
+ var base = Number.isFinite(resolved) ? resolved : Number((0, import_core.getVariableValue)((0, import_get_token.getSize)(36)));
102
+ return Math.round(base * .25);
103
+ };
104
+ var getProgressSize = import_core.styled.dynamic(function(val) {
105
+ var size = resolveProgressSize(val);
106
+ return {
107
+ height: size,
108
+ minWidth: size * 20,
109
+ width: "100%"
110
+ };
111
+ });
89
112
  var ProgressFrame = (0, import_core.styled)(import_stacks.YStack, {
90
113
  displayName: "Progress",
91
114
  overflow: "hidden",
92
- variants: { size: import_core.styled.dynamic(function(val) {
93
- var size = Math.round((0, import_core.getVariableValue)((0, import_get_token.getSize)(val === true ? 36 : val)) * .25);
94
- return {
95
- height: size,
96
- minWidth: (0, import_core.getVariableValue)(size) * 20,
97
- width: "100%"
98
- };
99
- }) }
115
+ variants: { size: getProgressSize }
100
116
  });
101
117
  var Progress = (0, import_helpers.withStaticProperties)((0, import_core.createStyledHOC)(ProgressFrame, function Progress2(props, forwardedRef) {
102
118
  var { __scopeProgress, value: valueProp, max: maxProp, getValueLabel = defaultGetValueLabel, size = true, ...progressProps } = props;
package/dist/cjs/Progress.native.js CHANGED
@@ -86,17 +86,33 @@ function isValidValueNumber(value, max) {
86
86
  return isNumber(value) && !Number.isNaN(value) && value <= max && value >= 0;
87
87
  }
88
88
  var DEFAULT_MAX = 100;
89
+ var progressTrackHeight = {
90
+ xs: 4,
91
+ sm: 6,
92
+ md: 9,
93
+ lg: 12,
94
+ xl: 16
95
+ };
96
+ var resolveProgressSize = function(val) {
97
+ if (typeof val === "string" && val in progressTrackHeight) {
98
+ return progressTrackHeight[val];
99
+ }
100
+ var resolved = Number((0, import_core.getVariableValue)((0, import_get_token.getSize)(val === true ? 36 : val)));
101
+ var base = Number.isFinite(resolved) ? resolved : Number((0, import_core.getVariableValue)((0, import_get_token.getSize)(36)));
102
+ return Math.round(base * .25);
103
+ };
104
+ var getProgressSize = import_core.styled.dynamic(function(val) {
105
+ var size = resolveProgressSize(val);
106
+ return {
107
+ height: size,
108
+ minWidth: size * 20,
109
+ width: "100%"
110
+ };
111
+ });
89
112
  var ProgressFrame = (0, import_core.styled)(import_stacks.YStack, {
90
113
  displayName: "Progress",
91
114
  overflow: "hidden",
92
- variants: { size: import_core.styled.dynamic(function(val) {
93
- var size = Math.round((0, import_core.getVariableValue)((0, import_get_token.getSize)(val === true ? 36 : val)) * .25);
94
- return {
95
- height: size,
96
- minWidth: (0, import_core.getVariableValue)(size) * 20,
97
- width: "100%"
98
- };
99
- }) }
115
+ variants: { size: getProgressSize }
100
116
  });
101
117
  var Progress = (0, import_helpers.withStaticProperties)((0, import_core.createStyledHOC)(ProgressFrame, function Progress2(props, forwardedRef) {
102
118
  var { __scopeProgress, value: valueProp, max: maxProp, getValueLabel = defaultGetValueLabel, size = true, ...progressProps } = props;
package/dist/cjs/Progress.native.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Progress.native.js","names":[],"sources":["cjs/Progress.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" || typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar Progress_exports = {};\n__export(Progress_exports, {\n Progress: () => Progress,\n ProgressFrame: () => ProgressFrame,\n ProgressIndicator: () => ProgressIndicator,\n ProgressIndicatorFrame: () => ProgressIndicatorFrame,\n createProgressScope: () => createProgressScope\n});\nmodule.exports = __toCommonJS(Progress_exports);\nvar import_jsx_runtime = require(\"react/jsx-runtime\");\nvar import_core = require(\"@tamagui/core\");\nvar import_create_context = require(\"@tamagui/create-context\");\nvar import_get_token = require(\"@tamagui/get-token\");\nvar import_helpers = require(\"@tamagui/helpers\");\nvar import_stacks = require(\"@tamagui/stacks\");\nvar import_react = require(\"react\");\nvar PROGRESS_NAME = \"Progress\";\nvar [createProgressContext, createProgressScope] = (0, import_create_context.createContextScope)(PROGRESS_NAME);\nvar [ProgressProvider, useProgressContext] = createProgressContext(PROGRESS_NAME);\nvar INDICATOR_NAME = \"ProgressIndicator\";\nvar ProgressIndicatorFrame = (0, import_core.styled)(import_stacks.YStack, {\n displayName: INDICATOR_NAME,\n height: \"100%\",\n width: \"100%\"\n});\nvar ProgressIndicator = (0, import_core.createStyledHOC)(ProgressIndicatorFrame, function ProgressIndicator2(props, forwardedRef) {\n var { __scopeProgress, transition, ...indicatorProps } = props;\n var context = useProgressContext(INDICATOR_NAME, __scopeProgress);\n var _context_value;\n var progressRatio = ((_context_value = context.value) !== null && _context_value !== void 0 ? _context_value : 0) / context.max;\n var x;\n if (import_core.isWeb) {\n x = `${-100 + progressRatio * 50}%`;\n } else {\n var baseWidth = context.width || 0;\n x = Math.ceil(-baseWidth * (2 - progressRatio));\n }\n var _context_value1;\n return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProgressIndicatorFrame, {\n \"data-state\": getProgressState(context.value, context.max),\n \"data-value\": (_context_value1 = context.value) !== null && _context_value1 !== void 0 ? _context_value1 : void 0,\n \"data-max\": context.max,\n x,\n width: \"200%\",\n ...!import_core.isWeb && context.width === 0 && {\n opacity: 0\n },\n ...indicatorProps,\n ref: forwardedRef,\n // only the indicator's slide transitions; `width` is a layout jump\n transition: !import_core.isWeb && !context.width ? null : {\n transform: transition\n }\n });\n});\nfunction defaultGetValueLabel(value, max) {\n return `${Math.round(value / max * 100)}%`;\n}\nfunction getProgressState(value, maxValue) {\n return value == null ? \"indeterminate\" : value === maxValue ? \"complete\" : \"loading\";\n}\nfunction isNumber(value) {\n return typeof value === \"number\";\n}\nfunction isValidMaxNumber(max) {\n return isNumber(max) && !Number.isNaN(max) && max > 0;\n}\nfunction isValidValueNumber(value, max) {\n return isNumber(value) && !Number.isNaN(value) && value <= max && value >= 0;\n}\nvar DEFAULT_MAX = 100;\nvar ProgressFrame = (0, import_core.styled)(import_stacks.YStack, {\n displayName: \"Progress\",\n overflow: \"hidden\",\n variants: {\n size: import_core.styled.dynamic(function(val) {\n var size = Math.round((0, import_core.getVariableValue)((0, import_get_token.getSize)(val === true ? 36 : val)) * 0.25);\n return {\n height: size,\n minWidth: (0, import_core.getVariableValue)(size) * 20,\n width: \"100%\"\n };\n })\n }\n});\nvar Progress = (0, import_helpers.withStaticProperties)((0, import_core.createStyledHOC)(ProgressFrame, function Progress2(props, forwardedRef) {\n var {\n // @ts-expect-error\n __scopeProgress,\n value: valueProp,\n max: maxProp,\n getValueLabel = defaultGetValueLabel,\n size = true,\n ...progressProps\n } = props;\n var max = isValidMaxNumber(maxProp) ? maxProp : DEFAULT_MAX;\n var value = isValidValueNumber(valueProp, max) ? Math.round(valueProp) : null;\n var valueLabel = isNumber(value) ? getValueLabel(value, max) : void 0;\n var [width, setWidth] = (0, import_react.useState)(0);\n return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProgressProvider, {\n scope: __scopeProgress,\n value,\n max,\n width,\n children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProgressFrame, {\n \"aria-valuemax\": max,\n \"aria-valuemin\": 0,\n \"aria-valuenow\": isNumber(value) ? value : void 0,\n \"aria-valuetext\": valueLabel,\n // @ts-ignore\n role: \"progressbar\",\n \"data-state\": getProgressState(value, max),\n \"data-value\": value !== null && value !== void 0 ? value : void 0,\n \"data-max\": max,\n size,\n ...progressProps,\n ...!import_core.isWeb && {\n onLayout: function(e) {\n var _progressProps_onLayout;\n var newWidth = Math.round(e.nativeEvent.layout.width);\n if (newWidth !== width) {\n setWidth(newWidth);\n }\n (_progressProps_onLayout = progressProps.onLayout) === null || _progressProps_onLayout === void 0 ? void 0 : _progressProps_onLayout.call(progressProps, e);\n }\n },\n ref: forwardedRef\n })\n });\n}), {\n Indicator: ProgressIndicator\n});\n//# sourceMappingURL=Progress.js.map\n"],"mappings":";;;AACA,IAAI,YAAY,OAAO;AACvB,IAAI,mBAAmB,OAAO;AAC9B,IAAI,oBAAoB,OAAO;AAC/B,IAAI,eAAe,OAAO,UAAU;AACpC,IAAI,YAAY,QAAQ,QAAQ;CAC9B,KAAK,IAAI,QAAQ,KACf,UAAU,QAAQ,MAAM;EAAE,KAAK,IAAI;EAAO,YAAY;CAAK,CAAC;AAChE;AACA,IAAI,eAAe,IAAI,MAAM,QAAQ,SAAS;CAC5C,IAAI,QAAQ,OAAO,SAAS,YAAY,OAAO,SAAS,YAAY;EAClE,KAAK,IAAI,OAAO,kBAAkB,IAAI,GACpC,IAAI,CAAC,aAAa,KAAK,IAAI,GAAG,KAAK,QAAQ,QACzC,UAAU,IAAI,KAAK;GAAE,WAAW,KAAK;GAAM,YAAY,EAAE,OAAO,iBAAiB,MAAM,GAAG,MAAM,KAAK;EAAW,CAAC;CACvH;CACA,OAAO;AACT;AACA,IAAI,gBAAgB,QAAQ,YAAY,UAAU,CAAC,GAAG,cAAc,EAAE,OAAO,KAAK,CAAC,GAAG,GAAG;AACzF,IAAI,mBAAmB,CAAC;AACxB,SAAS,kBAAkB;CACzB,gBAAgB;CAChB,qBAAqB;CACrB,yBAAyB;CACzB,8BAA8B;CAC9B,2BAA2B;AAC7B,CAAC;AACD,OAAO,UAAU,aAAa,gBAAgB;AAC9C,IAAI,qBAAqB,QAAQ,mBAAmB;AACpD,IAAI,cAAc,QAAQ,eAAe;AACzC,IAAI,wBAAwB,QAAQ,yBAAyB;AAC7D,IAAI,mBAAmB,QAAQ,oBAAoB;AACnD,IAAI,iBAAiB,QAAQ,kBAAkB;AAC/C,IAAI,gBAAgB,QAAQ,iBAAiB;AAC7C,IAAI,eAAe,QAAQ,OAAO;AAClC,IAAI,gBAAgB;AACpB,IAAI,CAAC,uBAAuB,wBAAwB,GAAG,sBAAsB,mBAAkB,CAAE,aAAa;AAC9G,IAAI,CAAC,kBAAkB,sBAAsB,sBAAsB,aAAa;AAChF,IAAI,iBAAiB;AACrB,IAAI,0BAA0B,GAAG,YAAY,OAAM,CAAE,cAAc,QAAQ;CACzE,aAAa;CACb,QAAQ;CACR,OAAO;AACT,CAAC;AACD,IAAI,qBAAqB,GAAG,YAAY,gBAAe,CAAE,wBAAwB,SAAS,mBAAmB,OAAO,cAAc;CAChI,IAAI,EAAE,iBAAiB,YAAY,GAAG,mBAAmB;CACzD,IAAI,UAAU,mBAAmB,gBAAgB,eAAe;CAChE,IAAI;CACJ,IAAI,kBAAkB,iBAAiB,QAAQ,WAAW,QAAQ,mBAAmB,KAAK,IAAI,iBAAiB,KAAK,QAAQ;CAC5H,IAAI;CACJ,IAAI,YAAY,OAAO;EACrB,IAAI,GAAG,CAAC,MAAM,gBAAgB,GAAG;CACnC,OAAO;EACL,IAAI,YAAY,QAAQ,SAAS;EACjC,IAAI,KAAK,KAAK,CAAC,aAAa,IAAI,cAAc;CAChD;CACA,IAAI;CACJ,OAAuB,iBAAC,GAAG,mBAAmB,IAAG,CAAE,wBAAwB;EACzE,cAAc,iBAAiB,QAAQ,OAAO,QAAQ,GAAG;EACzD,eAAe,kBAAkB,QAAQ,WAAW,QAAQ,oBAAoB,KAAK,IAAI,kBAAkB,KAAK;EAChH,YAAY,QAAQ;EACpB;EACA,OAAO;EACP,GAAG,CAAC,YAAY,SAAS,QAAQ,UAAU,KAAK,EAC9C,SAAS,EACX;EACA,GAAG;EACH,KAAK;EAEL,YAAY,CAAC,YAAY,SAAS,CAAC,QAAQ,QAAQ,OAAO,EACxD,WAAW,WACb;CACF,CAAC;AACH,CAAC;AACD,SAAS,qBAAqB,OAAO,KAAK;CACxC,OAAO,GAAG,KAAK,MAAM,QAAQ,MAAM,GAAG,EAAE;AAC1C;AACA,SAAS,iBAAiB,OAAO,UAAU;CACzC,OAAO,SAAS,OAAO,kBAAkB,UAAU,WAAW,aAAa;AAC7E;AACA,SAAS,SAAS,OAAO;CACvB,OAAO,OAAO,UAAU;AAC1B;AACA,SAAS,iBAAiB,KAAK;CAC7B,OAAO,SAAS,GAAG,KAAK,CAAC,OAAO,MAAM,GAAG,KAAK,MAAM;AACtD;AACA,SAAS,mBAAmB,OAAO,KAAK;CACtC,OAAO,SAAS,KAAK,KAAK,CAAC,OAAO,MAAM,KAAK,KAAK,SAAS,OAAO,SAAS;AAC7E;AACA,IAAI,cAAc;AAClB,IAAI,iBAAiB,GAAG,YAAY,OAAM,CAAE,cAAc,QAAQ;CAChE,aAAa;CACb,UAAU;CACV,UAAU,EACR,MAAM,YAAY,OAAO,QAAQ,SAAS,KAAK;EAC7C,IAAI,OAAO,KAAK,OAAO,GAAG,YAAY,iBAAgB,EAAG,GAAG,iBAAiB,QAAO,CAAE,QAAQ,OAAO,KAAK,GAAG,CAAC,IAAI,GAAI;EACtH,OAAO;GACL,QAAQ;GACR,WAAW,GAAG,YAAY,iBAAgB,CAAE,IAAI,IAAI;GACpD,OAAO;EACT;CACF,CAAC,EACH;AACF,CAAC;AACD,IAAI,YAAY,GAAG,eAAe,qBAAoB,EAAG,GAAG,YAAY,gBAAe,CAAE,eAAe,SAAS,UAAU,OAAO,cAAc;CAC9I,IAAI,EAEF,iBACA,OAAO,WACP,KAAK,SACL,gBAAgB,sBAChB,OAAO,MACP,GAAG,kBACD;CACJ,IAAI,MAAM,iBAAiB,OAAO,IAAI,UAAU;CAChD,IAAI,QAAQ,mBAAmB,WAAW,GAAG,IAAI,KAAK,MAAM,SAAS,IAAI;CACzE,IAAI,aAAa,SAAS,KAAK,IAAI,cAAc,OAAO,GAAG,IAAI,KAAK;CACpE,IAAI,CAAC,OAAO,aAAa,GAAG,aAAa,SAAQ,CAAE,CAAC;CACpD,OAAuB,iBAAC,GAAG,mBAAmB,IAAG,CAAE,kBAAkB;EACnE,OAAO;EACP;EACA;EACA;EACA,UAA0B,iBAAC,GAAG,mBAAmB,IAAG,CAAE,eAAe;GACnE,iBAAiB;GACjB,iBAAiB;GACjB,iBAAiB,SAAS,KAAK,IAAI,QAAQ,KAAK;GAChD,kBAAkB;GAElB,MAAM;GACN,cAAc,iBAAiB,OAAO,GAAG;GACzC,cAAc,UAAU,QAAQ,UAAU,KAAK,IAAI,QAAQ,KAAK;GAChE,YAAY;GACZ;GACA,GAAG;GACH,GAAG,CAAC,YAAY,SAAS,EACvB,UAAU,SAAS,GAAG;IACpB,IAAI;IACJ,IAAI,WAAW,KAAK,MAAM,EAAE,YAAY,OAAO,KAAK;IACpD,IAAI,aAAa,OAAO;KACtB,SAAS,QAAQ;IACnB;IACA,CAAC,0BAA0B,cAAc,cAAc,QAAQ,4BAA4B,KAAK,IAAI,KAAK,IAAI,wBAAwB,KAAK,eAAe,CAAC;GAC5J,EACF;GACA,KAAK;EACP,CAAC;CACH,CAAC;AACH,CAAC,GAAG,EACF,WAAW,kBACb,CAAC"}
1
+ {"version":3,"file":"Progress.native.js","names":[],"sources":["cjs/Progress.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" || typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar Progress_exports = {};\n__export(Progress_exports, {\n Progress: () => Progress,\n ProgressFrame: () => ProgressFrame,\n ProgressIndicator: () => ProgressIndicator,\n ProgressIndicatorFrame: () => ProgressIndicatorFrame,\n createProgressScope: () => createProgressScope\n});\nmodule.exports = __toCommonJS(Progress_exports);\nvar import_jsx_runtime = require(\"react/jsx-runtime\");\nvar import_core = require(\"@tamagui/core\");\nvar import_create_context = require(\"@tamagui/create-context\");\nvar import_get_token = require(\"@tamagui/get-token\");\nvar import_helpers = require(\"@tamagui/helpers\");\nvar import_stacks = require(\"@tamagui/stacks\");\nvar import_react = require(\"react\");\nvar PROGRESS_NAME = \"Progress\";\nvar [createProgressContext, createProgressScope] = (0, import_create_context.createContextScope)(PROGRESS_NAME);\nvar [ProgressProvider, useProgressContext] = createProgressContext(PROGRESS_NAME);\nvar INDICATOR_NAME = \"ProgressIndicator\";\nvar ProgressIndicatorFrame = (0, import_core.styled)(import_stacks.YStack, {\n displayName: INDICATOR_NAME,\n height: \"100%\",\n width: \"100%\"\n});\nvar ProgressIndicator = (0, import_core.createStyledHOC)(ProgressIndicatorFrame, function ProgressIndicator2(props, forwardedRef) {\n var { __scopeProgress, transition, ...indicatorProps } = props;\n var context = useProgressContext(INDICATOR_NAME, __scopeProgress);\n var _context_value;\n var progressRatio = ((_context_value = context.value) !== null && _context_value !== void 0 ? _context_value : 0) / context.max;\n var x;\n if (import_core.isWeb) {\n x = `${-100 + progressRatio * 50}%`;\n } else {\n var baseWidth = context.width || 0;\n x = Math.ceil(-baseWidth * (2 - progressRatio));\n }\n var _context_value1;\n return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProgressIndicatorFrame, {\n \"data-state\": getProgressState(context.value, context.max),\n \"data-value\": (_context_value1 = context.value) !== null && _context_value1 !== void 0 ? _context_value1 : void 0,\n \"data-max\": context.max,\n x,\n width: \"200%\",\n ...!import_core.isWeb && context.width === 0 && {\n opacity: 0\n },\n ...indicatorProps,\n ref: forwardedRef,\n // only the indicator's slide transitions; `width` is a layout jump\n transition: !import_core.isWeb && !context.width ? null : {\n transform: transition\n }\n });\n});\nfunction defaultGetValueLabel(value, max) {\n return `${Math.round(value / max * 100)}%`;\n}\nfunction getProgressState(value, maxValue) {\n return value == null ? \"indeterminate\" : value === maxValue ? \"complete\" : \"loading\";\n}\nfunction isNumber(value) {\n return typeof value === \"number\";\n}\nfunction isValidMaxNumber(max) {\n return isNumber(max) && !Number.isNaN(max) && max > 0;\n}\nfunction isValidValueNumber(value, max) {\n return isNumber(value) && !Number.isNaN(value) && value <= max && value >= 0;\n}\nvar DEFAULT_MAX = 100;\nvar progressTrackHeight = {\n xs: 4,\n sm: 6,\n md: 9,\n lg: 12,\n xl: 16\n};\nvar resolveProgressSize = function(val) {\n if (typeof val === \"string\" && val in progressTrackHeight) {\n return progressTrackHeight[val];\n }\n var resolved = Number((0, import_core.getVariableValue)((0, import_get_token.getSize)(val === true ? 36 : val)));\n var base = Number.isFinite(resolved) ? resolved : Number((0, import_core.getVariableValue)((0, import_get_token.getSize)(36)));\n return Math.round(base * 0.25);\n};\nvar getProgressSize = import_core.styled.dynamic(function(val) {\n var size = resolveProgressSize(val);\n return {\n height: size,\n minWidth: size * 20,\n width: \"100%\"\n };\n});\nvar ProgressFrame = (0, import_core.styled)(import_stacks.YStack, {\n displayName: \"Progress\",\n overflow: \"hidden\",\n variants: {\n size: getProgressSize\n }\n});\nvar Progress = (0, import_helpers.withStaticProperties)((0, import_core.createStyledHOC)(ProgressFrame, function Progress2(props, forwardedRef) {\n var {\n // @ts-expect-error\n __scopeProgress,\n value: valueProp,\n max: maxProp,\n getValueLabel = defaultGetValueLabel,\n size = true,\n ...progressProps\n } = props;\n var max = isValidMaxNumber(maxProp) ? maxProp : DEFAULT_MAX;\n var value = isValidValueNumber(valueProp, max) ? Math.round(valueProp) : null;\n var valueLabel = isNumber(value) ? getValueLabel(value, max) : void 0;\n var [width, setWidth] = (0, import_react.useState)(0);\n return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProgressProvider, {\n scope: __scopeProgress,\n value,\n max,\n width,\n children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProgressFrame, {\n \"aria-valuemax\": max,\n \"aria-valuemin\": 0,\n \"aria-valuenow\": isNumber(value) ? value : void 0,\n \"aria-valuetext\": valueLabel,\n // @ts-ignore\n role: \"progressbar\",\n \"data-state\": getProgressState(value, max),\n \"data-value\": value !== null && value !== void 0 ? value : void 0,\n \"data-max\": max,\n size,\n ...progressProps,\n ...!import_core.isWeb && {\n onLayout: function(e) {\n var _progressProps_onLayout;\n var newWidth = Math.round(e.nativeEvent.layout.width);\n if (newWidth !== width) {\n setWidth(newWidth);\n }\n (_progressProps_onLayout = progressProps.onLayout) === null || _progressProps_onLayout === void 0 ? void 0 : _progressProps_onLayout.call(progressProps, e);\n }\n },\n ref: forwardedRef\n })\n });\n}), {\n Indicator: ProgressIndicator\n});\n//# sourceMappingURL=Progress.js.map\n"],"mappings":"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"}
package/dist/esm/Progress.mjs CHANGED
@@ -54,17 +54,33 @@ function isValidValueNumber(value, max) {
54
54
  return isNumber(value) && !Number.isNaN(value) && value <= max && value >= 0;
55
55
  }
56
56
  const DEFAULT_MAX = 100;
57
+ const progressTrackHeight = {
58
+ xs: 4,
59
+ sm: 6,
60
+ md: 9,
61
+ lg: 12,
62
+ xl: 16
63
+ };
64
+ const resolveProgressSize = (val) => {
65
+ if (typeof val === "string" && val in progressTrackHeight) {
66
+ return progressTrackHeight[val];
67
+ }
68
+ const resolved = Number(getVariableValue(getSize(val === true ? 36 : val)));
69
+ const base = Number.isFinite(resolved) ? resolved : Number(getVariableValue(getSize(36)));
70
+ return Math.round(base * .25);
71
+ };
72
+ const getProgressSize = styled.dynamic((val) => {
73
+ const size = resolveProgressSize(val);
74
+ return {
75
+ height: size,
76
+ minWidth: size * 20,
77
+ width: "100%"
78
+ };
79
+ });
57
80
  const ProgressFrame = styled(YStack, {
58
81
  displayName: "Progress",
59
82
  overflow: "hidden",
60
- variants: { size: styled.dynamic((val) => {
61
- const size = Math.round(getVariableValue(getSize(val === true ? 36 : val)) * .25);
62
- return {
63
- height: size,
64
- minWidth: getVariableValue(size) * 20,
65
- width: "100%"
66
- };
67
- }) }
83
+ variants: { size: getProgressSize }
68
84
  });
69
85
  const Progress = withStaticProperties(createStyledHOC(ProgressFrame, function Progress2(props, forwardedRef) {
70
86
  const { __scopeProgress, value: valueProp, max: maxProp, getValueLabel = defaultGetValueLabel, size = true, ...progressProps } = props;
package/dist/esm/Progress.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Progress.js","names":[],"sources":["esm/Progress.js"],"sourcesContent":["import { createStyledHOC, getVariableValue, isWeb, styled } from \"@tamagui/core\";\nimport { createContextScope } from \"@tamagui/create-context\";\nimport { getSize } from \"@tamagui/get-token\";\nimport { withStaticProperties } from \"@tamagui/helpers\";\nimport { YStack } from \"@tamagui/stacks\";\nimport { useState } from \"react\";\nimport { jsx } from \"react/jsx-runtime\";\nconst PROGRESS_NAME = \"Progress\";\nconst [createProgressContext, createProgressScope] = createContextScope(PROGRESS_NAME);\nconst [ProgressProvider, useProgressContext] = createProgressContext(PROGRESS_NAME);\nconst INDICATOR_NAME = \"ProgressIndicator\";\nconst ProgressIndicatorFrame = styled(YStack, {\n displayName: INDICATOR_NAME,\n height: \"100%\",\n width: \"100%\"\n});\nconst ProgressIndicator = createStyledHOC(\n ProgressIndicatorFrame,\n function ProgressIndicator2(props, forwardedRef) {\n const { __scopeProgress, transition, ...indicatorProps } = props;\n const context = useProgressContext(INDICATOR_NAME, __scopeProgress);\n const progressRatio = (context.value ?? 0) / context.max;\n let x;\n if (isWeb) {\n x = `${-100 + progressRatio * 50}%`;\n } else {\n const baseWidth = context.width || 0;\n x = Math.ceil(-baseWidth * (2 - progressRatio));\n }\n return /* @__PURE__ */ jsx(\n ProgressIndicatorFrame,\n {\n \"data-state\": getProgressState(context.value, context.max),\n \"data-value\": context.value ?? void 0,\n \"data-max\": context.max,\n x,\n width: \"200%\",\n ...!isWeb && context.width === 0 && { opacity: 0 },\n ...indicatorProps,\n ref: forwardedRef,\n transition: !isWeb && !context.width ? null : { transform: transition }\n }\n );\n }\n);\nfunction defaultGetValueLabel(value, max) {\n return `${Math.round(value / max * 100)}%`;\n}\nfunction getProgressState(value, maxValue) {\n return value == null ? \"indeterminate\" : value === maxValue ? \"complete\" : \"loading\";\n}\nfunction isNumber(value) {\n return typeof value === \"number\";\n}\nfunction isValidMaxNumber(max) {\n return isNumber(max) && !Number.isNaN(max) && max > 0;\n}\nfunction isValidValueNumber(value, max) {\n return isNumber(value) && !Number.isNaN(value) && value <= max && value >= 0;\n}\nconst DEFAULT_MAX = 100;\nconst ProgressFrame = styled(YStack, {\n displayName: \"Progress\",\n overflow: \"hidden\",\n variants: {\n size: styled.dynamic((val) => {\n const size = Math.round(getVariableValue(getSize(val === true ? 36 : val)) * 0.25);\n return {\n height: size,\n minWidth: getVariableValue(size) * 20,\n width: \"100%\"\n };\n })\n }\n});\nconst Progress = withStaticProperties(\n createStyledHOC(ProgressFrame, function Progress2(props, forwardedRef) {\n const {\n // @ts-expect-error\n __scopeProgress,\n value: valueProp,\n max: maxProp,\n getValueLabel = defaultGetValueLabel,\n size = true,\n ...progressProps\n } = props;\n const max = isValidMaxNumber(maxProp) ? maxProp : DEFAULT_MAX;\n const value = isValidValueNumber(valueProp, max) ? Math.round(valueProp) : null;\n const valueLabel = isNumber(value) ? getValueLabel(value, max) : void 0;\n const [width, setWidth] = useState(0);\n return /* @__PURE__ */ jsx(ProgressProvider, { scope: __scopeProgress, value, max, width, children: /* @__PURE__ */ jsx(\n ProgressFrame,\n {\n \"aria-valuemax\": max,\n \"aria-valuemin\": 0,\n \"aria-valuenow\": isNumber(value) ? value : void 0,\n \"aria-valuetext\": valueLabel,\n role: \"progressbar\",\n \"data-state\": getProgressState(value, max),\n \"data-value\": value ?? void 0,\n \"data-max\": max,\n size,\n ...progressProps,\n ...!isWeb && {\n onLayout: (e) => {\n const newWidth = Math.round(e.nativeEvent.layout.width);\n if (newWidth !== width) {\n setWidth(newWidth);\n }\n progressProps.onLayout?.(e);\n }\n },\n ref: forwardedRef\n }\n ) });\n }),\n {\n Indicator: ProgressIndicator\n }\n);\nexport {\n Progress,\n ProgressFrame,\n ProgressIndicator,\n ProgressIndicatorFrame,\n createProgressScope\n};\n//# sourceMappingURL=Progress.js.map\n"],"mappings":"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"}
1
+ {"version":3,"file":"Progress.js","names":[],"sources":["esm/Progress.js"],"sourcesContent":["import { createStyledHOC, getVariableValue, isWeb, styled } from \"@tamagui/core\";\nimport { createContextScope } from \"@tamagui/create-context\";\nimport { getSize } from \"@tamagui/get-token\";\nimport { withStaticProperties } from \"@tamagui/helpers\";\nimport { YStack } from \"@tamagui/stacks\";\nimport { useState } from \"react\";\nimport { jsx } from \"react/jsx-runtime\";\nconst PROGRESS_NAME = \"Progress\";\nconst [createProgressContext, createProgressScope] = createContextScope(PROGRESS_NAME);\nconst [ProgressProvider, useProgressContext] = createProgressContext(PROGRESS_NAME);\nconst INDICATOR_NAME = \"ProgressIndicator\";\nconst ProgressIndicatorFrame = styled(YStack, {\n displayName: INDICATOR_NAME,\n height: \"100%\",\n width: \"100%\"\n});\nconst ProgressIndicator = createStyledHOC(\n ProgressIndicatorFrame,\n function ProgressIndicator2(props, forwardedRef) {\n const { __scopeProgress, transition, ...indicatorProps } = props;\n const context = useProgressContext(INDICATOR_NAME, __scopeProgress);\n const progressRatio = (context.value ?? 0) / context.max;\n let x;\n if (isWeb) {\n x = `${-100 + progressRatio * 50}%`;\n } else {\n const baseWidth = context.width || 0;\n x = Math.ceil(-baseWidth * (2 - progressRatio));\n }\n return /* @__PURE__ */ jsx(\n ProgressIndicatorFrame,\n {\n \"data-state\": getProgressState(context.value, context.max),\n \"data-value\": context.value ?? void 0,\n \"data-max\": context.max,\n x,\n width: \"200%\",\n ...!isWeb && context.width === 0 && { opacity: 0 },\n ...indicatorProps,\n ref: forwardedRef,\n transition: !isWeb && !context.width ? null : { transform: transition }\n }\n );\n }\n);\nfunction defaultGetValueLabel(value, max) {\n return `${Math.round(value / max * 100)}%`;\n}\nfunction getProgressState(value, maxValue) {\n return value == null ? \"indeterminate\" : value === maxValue ? \"complete\" : \"loading\";\n}\nfunction isNumber(value) {\n return typeof value === \"number\";\n}\nfunction isValidMaxNumber(max) {\n return isNumber(max) && !Number.isNaN(max) && max > 0;\n}\nfunction isValidValueNumber(value, max) {\n return isNumber(value) && !Number.isNaN(value) && value <= max && value >= 0;\n}\nconst DEFAULT_MAX = 100;\nconst progressTrackHeight = {\n xs: 4,\n sm: 6,\n md: 9,\n lg: 12,\n xl: 16\n};\nconst resolveProgressSize = (val) => {\n if (typeof val === \"string\" && val in progressTrackHeight) {\n return progressTrackHeight[val];\n }\n const resolved = Number(getVariableValue(getSize(val === true ? 36 : val)));\n const base = Number.isFinite(resolved) ? resolved : Number(getVariableValue(getSize(36)));\n return Math.round(base * 0.25);\n};\nconst getProgressSize = styled.dynamic((val) => {\n const size = resolveProgressSize(val);\n return {\n height: size,\n minWidth: size * 20,\n width: \"100%\"\n };\n});\nconst ProgressFrame = styled(YStack, {\n displayName: \"Progress\",\n overflow: \"hidden\",\n variants: {\n size: getProgressSize\n }\n});\nconst Progress = withStaticProperties(\n createStyledHOC(ProgressFrame, function Progress2(props, forwardedRef) {\n const {\n // @ts-expect-error\n __scopeProgress,\n value: valueProp,\n max: maxProp,\n getValueLabel = defaultGetValueLabel,\n size = true,\n ...progressProps\n } = props;\n const max = isValidMaxNumber(maxProp) ? maxProp : DEFAULT_MAX;\n const value = isValidValueNumber(valueProp, max) ? Math.round(valueProp) : null;\n const valueLabel = isNumber(value) ? getValueLabel(value, max) : void 0;\n const [width, setWidth] = useState(0);\n return /* @__PURE__ */ jsx(ProgressProvider, { scope: __scopeProgress, value, max, width, children: /* @__PURE__ */ jsx(\n ProgressFrame,\n {\n \"aria-valuemax\": max,\n \"aria-valuemin\": 0,\n \"aria-valuenow\": isNumber(value) ? value : void 0,\n \"aria-valuetext\": valueLabel,\n role: \"progressbar\",\n \"data-state\": getProgressState(value, max),\n \"data-value\": value ?? void 0,\n \"data-max\": max,\n size,\n ...progressProps,\n ...!isWeb && {\n onLayout: (e) => {\n const newWidth = Math.round(e.nativeEvent.layout.width);\n if (newWidth !== width) {\n setWidth(newWidth);\n }\n progressProps.onLayout?.(e);\n }\n },\n ref: forwardedRef\n }\n ) });\n }),\n {\n Indicator: ProgressIndicator\n }\n);\nexport {\n Progress,\n ProgressFrame,\n ProgressIndicator,\n ProgressIndicatorFrame,\n createProgressScope\n};\n//# sourceMappingURL=Progress.js.map\n"],"mappings":"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"}
package/dist/esm/Progress.native.js CHANGED
@@ -56,17 +56,33 @@ function isValidValueNumber(value, max) {
56
56
  return isNumber(value) && !Number.isNaN(value) && value <= max && value >= 0;
57
57
  }
58
58
  var DEFAULT_MAX = 100;
59
+ var progressTrackHeight = {
60
+ xs: 4,
61
+ sm: 6,
62
+ md: 9,
63
+ lg: 12,
64
+ xl: 16
65
+ };
66
+ var resolveProgressSize = function(val) {
67
+ if (typeof val === "string" && val in progressTrackHeight) {
68
+ return progressTrackHeight[val];
69
+ }
70
+ var resolved = Number(getVariableValue(getSize(val === true ? 36 : val)));
71
+ var base = Number.isFinite(resolved) ? resolved : Number(getVariableValue(getSize(36)));
72
+ return Math.round(base * .25);
73
+ };
74
+ var getProgressSize = styled.dynamic(function(val) {
75
+ var size = resolveProgressSize(val);
76
+ return {
77
+ height: size,
78
+ minWidth: size * 20,
79
+ width: "100%"
80
+ };
81
+ });
59
82
  var ProgressFrame = styled(YStack, {
60
83
  displayName: "Progress",
61
84
  overflow: "hidden",
62
- variants: { size: styled.dynamic(function(val) {
63
- var size = Math.round(getVariableValue(getSize(val === true ? 36 : val)) * .25);
64
- return {
65
- height: size,
66
- minWidth: getVariableValue(size) * 20,
67
- width: "100%"
68
- };
69
- }) }
85
+ variants: { size: getProgressSize }
70
86
  });
71
87
  var Progress = withStaticProperties(createStyledHOC(ProgressFrame, function Progress2(props, forwardedRef) {
72
88
  var { __scopeProgress, value: valueProp, max: maxProp, getValueLabel = defaultGetValueLabel, size = true, ...progressProps } = props;
package/dist/esm/Progress.native.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Progress.native.js","names":[],"sources":["esm/Progress.native.js"],"sourcesContent":["import { jsx as _jsx } from \"react/jsx-runtime\";\nimport { createStyledHOC, getVariableValue, isWeb, styled } from \"@tamagui/core\";\nimport { createContextScope } from \"@tamagui/create-context\";\nimport { getSize } from \"@tamagui/get-token\";\nimport { withStaticProperties } from \"@tamagui/helpers\";\nimport { YStack } from \"@tamagui/stacks\";\nimport { useState } from \"react\";\nvar PROGRESS_NAME = \"Progress\";\nvar [createProgressContext, createProgressScope] = createContextScope(PROGRESS_NAME);\nvar [ProgressProvider, useProgressContext] = createProgressContext(PROGRESS_NAME);\nvar INDICATOR_NAME = \"ProgressIndicator\";\nvar ProgressIndicatorFrame = styled(YStack, {\n displayName: INDICATOR_NAME,\n height: \"100%\",\n width: \"100%\"\n});\nvar ProgressIndicator = createStyledHOC(ProgressIndicatorFrame, function ProgressIndicator2(props, forwardedRef) {\n var { __scopeProgress, transition, ...indicatorProps } = props;\n var context = useProgressContext(INDICATOR_NAME, __scopeProgress);\n var _context_value;\n var progressRatio = ((_context_value = context.value) !== null && _context_value !== void 0 ? _context_value : 0) / context.max;\n var x;\n if (isWeb) {\n x = `${-100 + progressRatio * 50}%`;\n } else {\n var baseWidth = context.width || 0;\n x = Math.ceil(-baseWidth * (2 - progressRatio));\n }\n var _context_value1;\n return /* @__PURE__ */ _jsx(ProgressIndicatorFrame, {\n \"data-state\": getProgressState(context.value, context.max),\n \"data-value\": (_context_value1 = context.value) !== null && _context_value1 !== void 0 ? _context_value1 : void 0,\n \"data-max\": context.max,\n x,\n width: \"200%\",\n ...!isWeb && context.width === 0 && {\n opacity: 0\n },\n ...indicatorProps,\n ref: forwardedRef,\n // only the indicator's slide transitions; `width` is a layout jump\n transition: !isWeb && !context.width ? null : {\n transform: transition\n }\n });\n});\nfunction defaultGetValueLabel(value, max) {\n return `${Math.round(value / max * 100)}%`;\n}\nfunction getProgressState(value, maxValue) {\n return value == null ? \"indeterminate\" : value === maxValue ? \"complete\" : \"loading\";\n}\nfunction isNumber(value) {\n return typeof value === \"number\";\n}\nfunction isValidMaxNumber(max) {\n return isNumber(max) && !Number.isNaN(max) && max > 0;\n}\nfunction isValidValueNumber(value, max) {\n return isNumber(value) && !Number.isNaN(value) && value <= max && value >= 0;\n}\nvar DEFAULT_MAX = 100;\nvar ProgressFrame = styled(YStack, {\n displayName: \"Progress\",\n overflow: \"hidden\",\n variants: {\n size: styled.dynamic(function(val) {\n var size = Math.round(getVariableValue(getSize(val === true ? 36 : val)) * 0.25);\n return {\n height: size,\n minWidth: getVariableValue(size) * 20,\n width: \"100%\"\n };\n })\n }\n});\nvar Progress = withStaticProperties(createStyledHOC(ProgressFrame, function Progress2(props, forwardedRef) {\n var {\n // @ts-expect-error\n __scopeProgress,\n value: valueProp,\n max: maxProp,\n getValueLabel = defaultGetValueLabel,\n size = true,\n ...progressProps\n } = props;\n var max = isValidMaxNumber(maxProp) ? maxProp : DEFAULT_MAX;\n var value = isValidValueNumber(valueProp, max) ? Math.round(valueProp) : null;\n var valueLabel = isNumber(value) ? getValueLabel(value, max) : void 0;\n var [width, setWidth] = useState(0);\n return /* @__PURE__ */ _jsx(ProgressProvider, {\n scope: __scopeProgress,\n value,\n max,\n width,\n children: /* @__PURE__ */ _jsx(ProgressFrame, {\n \"aria-valuemax\": max,\n \"aria-valuemin\": 0,\n \"aria-valuenow\": isNumber(value) ? value : void 0,\n \"aria-valuetext\": valueLabel,\n // @ts-ignore\n role: \"progressbar\",\n \"data-state\": getProgressState(value, max),\n \"data-value\": value !== null && value !== void 0 ? value : void 0,\n \"data-max\": max,\n size,\n ...progressProps,\n ...!isWeb && {\n onLayout: function(e) {\n var _progressProps_onLayout;\n var newWidth = Math.round(e.nativeEvent.layout.width);\n if (newWidth !== width) {\n setWidth(newWidth);\n }\n (_progressProps_onLayout = progressProps.onLayout) === null || _progressProps_onLayout === void 0 ? void 0 : _progressProps_onLayout.call(progressProps, e);\n }\n },\n ref: forwardedRef\n })\n });\n}), {\n Indicator: ProgressIndicator\n});\nexport {\n Progress,\n ProgressFrame,\n ProgressIndicator,\n ProgressIndicatorFrame,\n createProgressScope\n};\n//# sourceMappingURL=Progress.js.map\n"],"mappings":"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"}
1
+ {"version":3,"file":"Progress.native.js","names":[],"sources":["esm/Progress.native.js"],"sourcesContent":["import { jsx as _jsx } from \"react/jsx-runtime\";\nimport { createStyledHOC, getVariableValue, isWeb, styled } from \"@tamagui/core\";\nimport { createContextScope } from \"@tamagui/create-context\";\nimport { getSize } from \"@tamagui/get-token\";\nimport { withStaticProperties } from \"@tamagui/helpers\";\nimport { YStack } from \"@tamagui/stacks\";\nimport { useState } from \"react\";\nvar PROGRESS_NAME = \"Progress\";\nvar [createProgressContext, createProgressScope] = createContextScope(PROGRESS_NAME);\nvar [ProgressProvider, useProgressContext] = createProgressContext(PROGRESS_NAME);\nvar INDICATOR_NAME = \"ProgressIndicator\";\nvar ProgressIndicatorFrame = styled(YStack, {\n displayName: INDICATOR_NAME,\n height: \"100%\",\n width: \"100%\"\n});\nvar ProgressIndicator = createStyledHOC(ProgressIndicatorFrame, function ProgressIndicator2(props, forwardedRef) {\n var { __scopeProgress, transition, ...indicatorProps } = props;\n var context = useProgressContext(INDICATOR_NAME, __scopeProgress);\n var _context_value;\n var progressRatio = ((_context_value = context.value) !== null && _context_value !== void 0 ? _context_value : 0) / context.max;\n var x;\n if (isWeb) {\n x = `${-100 + progressRatio * 50}%`;\n } else {\n var baseWidth = context.width || 0;\n x = Math.ceil(-baseWidth * (2 - progressRatio));\n }\n var _context_value1;\n return /* @__PURE__ */ _jsx(ProgressIndicatorFrame, {\n \"data-state\": getProgressState(context.value, context.max),\n \"data-value\": (_context_value1 = context.value) !== null && _context_value1 !== void 0 ? _context_value1 : void 0,\n \"data-max\": context.max,\n x,\n width: \"200%\",\n ...!isWeb && context.width === 0 && {\n opacity: 0\n },\n ...indicatorProps,\n ref: forwardedRef,\n // only the indicator's slide transitions; `width` is a layout jump\n transition: !isWeb && !context.width ? null : {\n transform: transition\n }\n });\n});\nfunction defaultGetValueLabel(value, max) {\n return `${Math.round(value / max * 100)}%`;\n}\nfunction getProgressState(value, maxValue) {\n return value == null ? \"indeterminate\" : value === maxValue ? \"complete\" : \"loading\";\n}\nfunction isNumber(value) {\n return typeof value === \"number\";\n}\nfunction isValidMaxNumber(max) {\n return isNumber(max) && !Number.isNaN(max) && max > 0;\n}\nfunction isValidValueNumber(value, max) {\n return isNumber(value) && !Number.isNaN(value) && value <= max && value >= 0;\n}\nvar DEFAULT_MAX = 100;\nvar progressTrackHeight = {\n xs: 4,\n sm: 6,\n md: 9,\n lg: 12,\n xl: 16\n};\nvar resolveProgressSize = function(val) {\n if (typeof val === \"string\" && val in progressTrackHeight) {\n return progressTrackHeight[val];\n }\n var resolved = Number(getVariableValue(getSize(val === true ? 36 : val)));\n var base = Number.isFinite(resolved) ? resolved : Number(getVariableValue(getSize(36)));\n return Math.round(base * 0.25);\n};\nvar getProgressSize = styled.dynamic(function(val) {\n var size = resolveProgressSize(val);\n return {\n height: size,\n minWidth: size * 20,\n width: \"100%\"\n };\n});\nvar ProgressFrame = styled(YStack, {\n displayName: \"Progress\",\n overflow: \"hidden\",\n variants: {\n size: getProgressSize\n }\n});\nvar Progress = withStaticProperties(createStyledHOC(ProgressFrame, function Progress2(props, forwardedRef) {\n var {\n // @ts-expect-error\n __scopeProgress,\n value: valueProp,\n max: maxProp,\n getValueLabel = defaultGetValueLabel,\n size = true,\n ...progressProps\n } = props;\n var max = isValidMaxNumber(maxProp) ? maxProp : DEFAULT_MAX;\n var value = isValidValueNumber(valueProp, max) ? Math.round(valueProp) : null;\n var valueLabel = isNumber(value) ? getValueLabel(value, max) : void 0;\n var [width, setWidth] = useState(0);\n return /* @__PURE__ */ _jsx(ProgressProvider, {\n scope: __scopeProgress,\n value,\n max,\n width,\n children: /* @__PURE__ */ _jsx(ProgressFrame, {\n \"aria-valuemax\": max,\n \"aria-valuemin\": 0,\n \"aria-valuenow\": isNumber(value) ? value : void 0,\n \"aria-valuetext\": valueLabel,\n // @ts-ignore\n role: \"progressbar\",\n \"data-state\": getProgressState(value, max),\n \"data-value\": value !== null && value !== void 0 ? value : void 0,\n \"data-max\": max,\n size,\n ...progressProps,\n ...!isWeb && {\n onLayout: function(e) {\n var _progressProps_onLayout;\n var newWidth = Math.round(e.nativeEvent.layout.width);\n if (newWidth !== width) {\n setWidth(newWidth);\n }\n (_progressProps_onLayout = progressProps.onLayout) === null || _progressProps_onLayout === void 0 ? void 0 : _progressProps_onLayout.call(progressProps, e);\n }\n },\n ref: forwardedRef\n })\n });\n}), {\n Indicator: ProgressIndicator\n});\nexport {\n Progress,\n ProgressFrame,\n ProgressIndicator,\n ProgressIndicatorFrame,\n createProgressScope\n};\n//# sourceMappingURL=Progress.js.map\n"],"mappings":"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"}
package/dist/jsx/Progress.mjs CHANGED
@@ -54,17 +54,33 @@ function isValidValueNumber(value, max) {
54
54
  return isNumber(value) && !Number.isNaN(value) && value <= max && value >= 0;
55
55
  }
56
56
  const DEFAULT_MAX = 100;
57
+ const progressTrackHeight = {
58
+ xs: 4,
59
+ sm: 6,
60
+ md: 9,
61
+ lg: 12,
62
+ xl: 16
63
+ };
64
+ const resolveProgressSize = (val) => {
65
+ if (typeof val === "string" && val in progressTrackHeight) {
66
+ return progressTrackHeight[val];
67
+ }
68
+ const resolved = Number(getVariableValue(getSize(val === true ? 36 : val)));
69
+ const base = Number.isFinite(resolved) ? resolved : Number(getVariableValue(getSize(36)));
70
+ return Math.round(base * .25);
71
+ };
72
+ const getProgressSize = styled.dynamic((val) => {
73
+ const size = resolveProgressSize(val);
74
+ return {
75
+ height: size,
76
+ minWidth: size * 20,
77
+ width: "100%"
78
+ };
79
+ });
57
80
  const ProgressFrame = styled(YStack, {
58
81
  displayName: "Progress",
59
82
  overflow: "hidden",
60
- variants: { size: styled.dynamic((val) => {
61
- const size = Math.round(getVariableValue(getSize(val === true ? 36 : val)) * .25);
62
- return {
63
- height: size,
64
- minWidth: getVariableValue(size) * 20,
65
- width: "100%"
66
- };
67
- }) }
83
+ variants: { size: getProgressSize }
68
84
  });
69
85
  const Progress = withStaticProperties(createStyledHOC(ProgressFrame, function Progress2(props, forwardedRef) {
70
86
  const { __scopeProgress, value: valueProp, max: maxProp, getValueLabel = defaultGetValueLabel, size = true, ...progressProps } = props;
package/dist/jsx/Progress.mjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Progress.js","names":[],"sources":["jsx/Progress.js"],"sourcesContent":["import { createStyledHOC, getVariableValue, isWeb, styled } from \"@tamagui/core\";\nimport { createContextScope } from \"@tamagui/create-context\";\nimport { getSize } from \"@tamagui/get-token\";\nimport { withStaticProperties } from \"@tamagui/helpers\";\nimport { YStack } from \"@tamagui/stacks\";\nimport { useState } from \"react\";\nimport { jsx } from \"react/jsx-runtime\";\nconst PROGRESS_NAME = \"Progress\";\nconst [createProgressContext, createProgressScope] = createContextScope(PROGRESS_NAME);\nconst [ProgressProvider, useProgressContext] = createProgressContext(PROGRESS_NAME);\nconst INDICATOR_NAME = \"ProgressIndicator\";\nconst ProgressIndicatorFrame = styled(YStack, {\n displayName: INDICATOR_NAME,\n height: \"100%\",\n width: \"100%\"\n});\nconst ProgressIndicator = createStyledHOC(\n ProgressIndicatorFrame,\n function ProgressIndicator2(props, forwardedRef) {\n const { __scopeProgress, transition, ...indicatorProps } = props;\n const context = useProgressContext(INDICATOR_NAME, __scopeProgress);\n const progressRatio = (context.value ?? 0) / context.max;\n let x;\n if (isWeb) {\n x = `${-100 + progressRatio * 50}%`;\n } else {\n const baseWidth = context.width || 0;\n x = Math.ceil(-baseWidth * (2 - progressRatio));\n }\n return /* @__PURE__ */ jsx(\n ProgressIndicatorFrame,\n {\n \"data-state\": getProgressState(context.value, context.max),\n \"data-value\": context.value ?? void 0,\n \"data-max\": context.max,\n x,\n width: \"200%\",\n ...!isWeb && context.width === 0 && { opacity: 0 },\n ...indicatorProps,\n ref: forwardedRef,\n transition: !isWeb && !context.width ? null : { transform: transition }\n }\n );\n }\n);\nfunction defaultGetValueLabel(value, max) {\n return `${Math.round(value / max * 100)}%`;\n}\nfunction getProgressState(value, maxValue) {\n return value == null ? \"indeterminate\" : value === maxValue ? \"complete\" : \"loading\";\n}\nfunction isNumber(value) {\n return typeof value === \"number\";\n}\nfunction isValidMaxNumber(max) {\n return isNumber(max) && !Number.isNaN(max) && max > 0;\n}\nfunction isValidValueNumber(value, max) {\n return isNumber(value) && !Number.isNaN(value) && value <= max && value >= 0;\n}\nconst DEFAULT_MAX = 100;\nconst ProgressFrame = styled(YStack, {\n displayName: \"Progress\",\n overflow: \"hidden\",\n variants: {\n size: styled.dynamic((val) => {\n const size = Math.round(getVariableValue(getSize(val === true ? 36 : val)) * 0.25);\n return {\n height: size,\n minWidth: getVariableValue(size) * 20,\n width: \"100%\"\n };\n })\n }\n});\nconst Progress = withStaticProperties(\n createStyledHOC(ProgressFrame, function Progress2(props, forwardedRef) {\n const {\n // @ts-expect-error\n __scopeProgress,\n value: valueProp,\n max: maxProp,\n getValueLabel = defaultGetValueLabel,\n size = true,\n ...progressProps\n } = props;\n const max = isValidMaxNumber(maxProp) ? maxProp : DEFAULT_MAX;\n const value = isValidValueNumber(valueProp, max) ? Math.round(valueProp) : null;\n const valueLabel = isNumber(value) ? getValueLabel(value, max) : void 0;\n const [width, setWidth] = useState(0);\n return /* @__PURE__ */ jsx(ProgressProvider, { scope: __scopeProgress, value, max, width, children: /* @__PURE__ */ jsx(\n ProgressFrame,\n {\n \"aria-valuemax\": max,\n \"aria-valuemin\": 0,\n \"aria-valuenow\": isNumber(value) ? value : void 0,\n \"aria-valuetext\": valueLabel,\n role: \"progressbar\",\n \"data-state\": getProgressState(value, max),\n \"data-value\": value ?? void 0,\n \"data-max\": max,\n size,\n ...progressProps,\n ...!isWeb && {\n onLayout: (e) => {\n const newWidth = Math.round(e.nativeEvent.layout.width);\n if (newWidth !== width) {\n setWidth(newWidth);\n }\n progressProps.onLayout?.(e);\n }\n },\n ref: forwardedRef\n }\n ) });\n }),\n {\n Indicator: ProgressIndicator\n }\n);\nexport {\n Progress,\n ProgressFrame,\n ProgressIndicator,\n ProgressIndicatorFrame,\n createProgressScope\n};\n//# sourceMappingURL=Progress.js.map\n"],"mappings":"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"}
1
+ {"version":3,"file":"Progress.js","names":[],"sources":["jsx/Progress.js"],"sourcesContent":["import { createStyledHOC, getVariableValue, isWeb, styled } from \"@tamagui/core\";\nimport { createContextScope } from \"@tamagui/create-context\";\nimport { getSize } from \"@tamagui/get-token\";\nimport { withStaticProperties } from \"@tamagui/helpers\";\nimport { YStack } from \"@tamagui/stacks\";\nimport { useState } from \"react\";\nimport { jsx } from \"react/jsx-runtime\";\nconst PROGRESS_NAME = \"Progress\";\nconst [createProgressContext, createProgressScope] = createContextScope(PROGRESS_NAME);\nconst [ProgressProvider, useProgressContext] = createProgressContext(PROGRESS_NAME);\nconst INDICATOR_NAME = \"ProgressIndicator\";\nconst ProgressIndicatorFrame = styled(YStack, {\n displayName: INDICATOR_NAME,\n height: \"100%\",\n width: \"100%\"\n});\nconst ProgressIndicator = createStyledHOC(\n ProgressIndicatorFrame,\n function ProgressIndicator2(props, forwardedRef) {\n const { __scopeProgress, transition, ...indicatorProps } = props;\n const context = useProgressContext(INDICATOR_NAME, __scopeProgress);\n const progressRatio = (context.value ?? 0) / context.max;\n let x;\n if (isWeb) {\n x = `${-100 + progressRatio * 50}%`;\n } else {\n const baseWidth = context.width || 0;\n x = Math.ceil(-baseWidth * (2 - progressRatio));\n }\n return /* @__PURE__ */ jsx(\n ProgressIndicatorFrame,\n {\n \"data-state\": getProgressState(context.value, context.max),\n \"data-value\": context.value ?? void 0,\n \"data-max\": context.max,\n x,\n width: \"200%\",\n ...!isWeb && context.width === 0 && { opacity: 0 },\n ...indicatorProps,\n ref: forwardedRef,\n transition: !isWeb && !context.width ? null : { transform: transition }\n }\n );\n }\n);\nfunction defaultGetValueLabel(value, max) {\n return `${Math.round(value / max * 100)}%`;\n}\nfunction getProgressState(value, maxValue) {\n return value == null ? \"indeterminate\" : value === maxValue ? \"complete\" : \"loading\";\n}\nfunction isNumber(value) {\n return typeof value === \"number\";\n}\nfunction isValidMaxNumber(max) {\n return isNumber(max) && !Number.isNaN(max) && max > 0;\n}\nfunction isValidValueNumber(value, max) {\n return isNumber(value) && !Number.isNaN(value) && value <= max && value >= 0;\n}\nconst DEFAULT_MAX = 100;\nconst progressTrackHeight = {\n xs: 4,\n sm: 6,\n md: 9,\n lg: 12,\n xl: 16\n};\nconst resolveProgressSize = (val) => {\n if (typeof val === \"string\" && val in progressTrackHeight) {\n return progressTrackHeight[val];\n }\n const resolved = Number(getVariableValue(getSize(val === true ? 36 : val)));\n const base = Number.isFinite(resolved) ? resolved : Number(getVariableValue(getSize(36)));\n return Math.round(base * 0.25);\n};\nconst getProgressSize = styled.dynamic((val) => {\n const size = resolveProgressSize(val);\n return {\n height: size,\n minWidth: size * 20,\n width: \"100%\"\n };\n});\nconst ProgressFrame = styled(YStack, {\n displayName: \"Progress\",\n overflow: \"hidden\",\n variants: {\n size: getProgressSize\n }\n});\nconst Progress = withStaticProperties(\n createStyledHOC(ProgressFrame, function Progress2(props, forwardedRef) {\n const {\n // @ts-expect-error\n __scopeProgress,\n value: valueProp,\n max: maxProp,\n getValueLabel = defaultGetValueLabel,\n size = true,\n ...progressProps\n } = props;\n const max = isValidMaxNumber(maxProp) ? maxProp : DEFAULT_MAX;\n const value = isValidValueNumber(valueProp, max) ? Math.round(valueProp) : null;\n const valueLabel = isNumber(value) ? getValueLabel(value, max) : void 0;\n const [width, setWidth] = useState(0);\n return /* @__PURE__ */ jsx(ProgressProvider, { scope: __scopeProgress, value, max, width, children: /* @__PURE__ */ jsx(\n ProgressFrame,\n {\n \"aria-valuemax\": max,\n \"aria-valuemin\": 0,\n \"aria-valuenow\": isNumber(value) ? value : void 0,\n \"aria-valuetext\": valueLabel,\n role: \"progressbar\",\n \"data-state\": getProgressState(value, max),\n \"data-value\": value ?? void 0,\n \"data-max\": max,\n size,\n ...progressProps,\n ...!isWeb && {\n onLayout: (e) => {\n const newWidth = Math.round(e.nativeEvent.layout.width);\n if (newWidth !== width) {\n setWidth(newWidth);\n }\n progressProps.onLayout?.(e);\n }\n },\n ref: forwardedRef\n }\n ) });\n }),\n {\n Indicator: ProgressIndicator\n }\n);\nexport {\n Progress,\n ProgressFrame,\n ProgressIndicator,\n ProgressIndicatorFrame,\n createProgressScope\n};\n//# sourceMappingURL=Progress.js.map\n"],"mappings":"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"}
package/dist/jsx/Progress.native.cjs CHANGED
@@ -86,17 +86,33 @@ function isValidValueNumber(value, max) {
86
86
  return isNumber(value) && !Number.isNaN(value) && value <= max && value >= 0;
87
87
  }
88
88
  var DEFAULT_MAX = 100;
89
+ var progressTrackHeight = {
90
+ xs: 4,
91
+ sm: 6,
92
+ md: 9,
93
+ lg: 12,
94
+ xl: 16
95
+ };
96
+ var resolveProgressSize = function(val) {
97
+ if (typeof val === "string" && val in progressTrackHeight) {
98
+ return progressTrackHeight[val];
99
+ }
100
+ var resolved = Number((0, import_core.getVariableValue)((0, import_get_token.getSize)(val === true ? 36 : val)));
101
+ var base = Number.isFinite(resolved) ? resolved : Number((0, import_core.getVariableValue)((0, import_get_token.getSize)(36)));
102
+ return Math.round(base * .25);
103
+ };
104
+ var getProgressSize = import_core.styled.dynamic(function(val) {
105
+ var size = resolveProgressSize(val);
106
+ return {
107
+ height: size,
108
+ minWidth: size * 20,
109
+ width: "100%"
110
+ };
111
+ });
89
112
  var ProgressFrame = (0, import_core.styled)(import_stacks.YStack, {
90
113
  displayName: "Progress",
91
114
  overflow: "hidden",
92
- variants: { size: import_core.styled.dynamic(function(val) {
93
- var size = Math.round((0, import_core.getVariableValue)((0, import_get_token.getSize)(val === true ? 36 : val)) * .25);
94
- return {
95
- height: size,
96
- minWidth: (0, import_core.getVariableValue)(size) * 20,
97
- width: "100%"
98
- };
99
- }) }
115
+ variants: { size: getProgressSize }
100
116
  });
101
117
  var Progress = (0, import_helpers.withStaticProperties)((0, import_core.createStyledHOC)(ProgressFrame, function Progress2(props, forwardedRef) {
102
118
  var { __scopeProgress, value: valueProp, max: maxProp, getValueLabel = defaultGetValueLabel, size = true, ...progressProps } = props;
package/dist/jsx/Progress.native.js CHANGED
@@ -86,17 +86,33 @@ function isValidValueNumber(value, max) {
86
86
  return isNumber(value) && !Number.isNaN(value) && value <= max && value >= 0;
87
87
  }
88
88
  var DEFAULT_MAX = 100;
89
+ var progressTrackHeight = {
90
+ xs: 4,
91
+ sm: 6,
92
+ md: 9,
93
+ lg: 12,
94
+ xl: 16
95
+ };
96
+ var resolveProgressSize = function(val) {
97
+ if (typeof val === "string" && val in progressTrackHeight) {
98
+ return progressTrackHeight[val];
99
+ }
100
+ var resolved = Number((0, import_core.getVariableValue)((0, import_get_token.getSize)(val === true ? 36 : val)));
101
+ var base = Number.isFinite(resolved) ? resolved : Number((0, import_core.getVariableValue)((0, import_get_token.getSize)(36)));
102
+ return Math.round(base * .25);
103
+ };
104
+ var getProgressSize = import_core.styled.dynamic(function(val) {
105
+ var size = resolveProgressSize(val);
106
+ return {
107
+ height: size,
108
+ minWidth: size * 20,
109
+ width: "100%"
110
+ };
111
+ });
89
112
  var ProgressFrame = (0, import_core.styled)(import_stacks.YStack, {
90
113
  displayName: "Progress",
91
114
  overflow: "hidden",
92
- variants: { size: import_core.styled.dynamic(function(val) {
93
- var size = Math.round((0, import_core.getVariableValue)((0, import_get_token.getSize)(val === true ? 36 : val)) * .25);
94
- return {
95
- height: size,
96
- minWidth: (0, import_core.getVariableValue)(size) * 20,
97
- width: "100%"
98
- };
99
- }) }
115
+ variants: { size: getProgressSize }
100
116
  });
101
117
  var Progress = (0, import_helpers.withStaticProperties)((0, import_core.createStyledHOC)(ProgressFrame, function Progress2(props, forwardedRef) {
102
118
  var { __scopeProgress, value: valueProp, max: maxProp, getValueLabel = defaultGetValueLabel, size = true, ...progressProps } = props;
package/dist/jsx/Progress.native.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Progress.native.js","names":[],"sources":["jsx/Progress.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" || typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar Progress_exports = {};\n__export(Progress_exports, {\n Progress: () => Progress,\n ProgressFrame: () => ProgressFrame,\n ProgressIndicator: () => ProgressIndicator,\n ProgressIndicatorFrame: () => ProgressIndicatorFrame,\n createProgressScope: () => createProgressScope\n});\nmodule.exports = __toCommonJS(Progress_exports);\nvar import_jsx_runtime = require(\"react/jsx-runtime\");\nvar import_core = require(\"@tamagui/core\");\nvar import_create_context = require(\"@tamagui/create-context\");\nvar import_get_token = require(\"@tamagui/get-token\");\nvar import_helpers = require(\"@tamagui/helpers\");\nvar import_stacks = require(\"@tamagui/stacks\");\nvar import_react = require(\"react\");\nvar PROGRESS_NAME = \"Progress\";\nvar [createProgressContext, createProgressScope] = (0, import_create_context.createContextScope)(PROGRESS_NAME);\nvar [ProgressProvider, useProgressContext] = createProgressContext(PROGRESS_NAME);\nvar INDICATOR_NAME = \"ProgressIndicator\";\nvar ProgressIndicatorFrame = (0, import_core.styled)(import_stacks.YStack, {\n displayName: INDICATOR_NAME,\n height: \"100%\",\n width: \"100%\"\n});\nvar ProgressIndicator = (0, import_core.createStyledHOC)(ProgressIndicatorFrame, function ProgressIndicator2(props, forwardedRef) {\n var { __scopeProgress, transition, ...indicatorProps } = props;\n var context = useProgressContext(INDICATOR_NAME, __scopeProgress);\n var _context_value;\n var progressRatio = ((_context_value = context.value) !== null && _context_value !== void 0 ? _context_value : 0) / context.max;\n var x;\n if (import_core.isWeb) {\n x = `${-100 + progressRatio * 50}%`;\n } else {\n var baseWidth = context.width || 0;\n x = Math.ceil(-baseWidth * (2 - progressRatio));\n }\n var _context_value1;\n return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProgressIndicatorFrame, {\n \"data-state\": getProgressState(context.value, context.max),\n \"data-value\": (_context_value1 = context.value) !== null && _context_value1 !== void 0 ? _context_value1 : void 0,\n \"data-max\": context.max,\n x,\n width: \"200%\",\n ...!import_core.isWeb && context.width === 0 && {\n opacity: 0\n },\n ...indicatorProps,\n ref: forwardedRef,\n // only the indicator's slide transitions; `width` is a layout jump\n transition: !import_core.isWeb && !context.width ? null : {\n transform: transition\n }\n });\n});\nfunction defaultGetValueLabel(value, max) {\n return `${Math.round(value / max * 100)}%`;\n}\nfunction getProgressState(value, maxValue) {\n return value == null ? \"indeterminate\" : value === maxValue ? \"complete\" : \"loading\";\n}\nfunction isNumber(value) {\n return typeof value === \"number\";\n}\nfunction isValidMaxNumber(max) {\n return isNumber(max) && !Number.isNaN(max) && max > 0;\n}\nfunction isValidValueNumber(value, max) {\n return isNumber(value) && !Number.isNaN(value) && value <= max && value >= 0;\n}\nvar DEFAULT_MAX = 100;\nvar ProgressFrame = (0, import_core.styled)(import_stacks.YStack, {\n displayName: \"Progress\",\n overflow: \"hidden\",\n variants: {\n size: import_core.styled.dynamic(function(val) {\n var size = Math.round((0, import_core.getVariableValue)((0, import_get_token.getSize)(val === true ? 36 : val)) * 0.25);\n return {\n height: size,\n minWidth: (0, import_core.getVariableValue)(size) * 20,\n width: \"100%\"\n };\n })\n }\n});\nvar Progress = (0, import_helpers.withStaticProperties)((0, import_core.createStyledHOC)(ProgressFrame, function Progress2(props, forwardedRef) {\n var {\n // @ts-expect-error\n __scopeProgress,\n value: valueProp,\n max: maxProp,\n getValueLabel = defaultGetValueLabel,\n size = true,\n ...progressProps\n } = props;\n var max = isValidMaxNumber(maxProp) ? maxProp : DEFAULT_MAX;\n var value = isValidValueNumber(valueProp, max) ? Math.round(valueProp) : null;\n var valueLabel = isNumber(value) ? getValueLabel(value, max) : void 0;\n var [width, setWidth] = (0, import_react.useState)(0);\n return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProgressProvider, {\n scope: __scopeProgress,\n value,\n max,\n width,\n children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProgressFrame, {\n \"aria-valuemax\": max,\n \"aria-valuemin\": 0,\n \"aria-valuenow\": isNumber(value) ? value : void 0,\n \"aria-valuetext\": valueLabel,\n // @ts-ignore\n role: \"progressbar\",\n \"data-state\": getProgressState(value, max),\n \"data-value\": value !== null && value !== void 0 ? value : void 0,\n \"data-max\": max,\n size,\n ...progressProps,\n ...!import_core.isWeb && {\n onLayout: function(e) {\n var _progressProps_onLayout;\n var newWidth = Math.round(e.nativeEvent.layout.width);\n if (newWidth !== width) {\n setWidth(newWidth);\n }\n (_progressProps_onLayout = progressProps.onLayout) === null || _progressProps_onLayout === void 0 ? void 0 : _progressProps_onLayout.call(progressProps, e);\n }\n },\n ref: forwardedRef\n })\n });\n}), {\n Indicator: ProgressIndicator\n});\n//# sourceMappingURL=Progress.js.map\n"],"mappings":"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"}
1
+ {"version":3,"file":"Progress.native.js","names":[],"sources":["jsx/Progress.native.js"],"sourcesContent":["\"use strict\";\nvar __defProp = Object.defineProperty;\nvar __getOwnPropDesc = Object.getOwnPropertyDescriptor;\nvar __getOwnPropNames = Object.getOwnPropertyNames;\nvar __hasOwnProp = Object.prototype.hasOwnProperty;\nvar __export = (target, all) => {\n for (var name in all)\n __defProp(target, name, { get: all[name], enumerable: true });\n};\nvar __copyProps = (to, from, except, desc) => {\n if (from && typeof from === \"object\" || typeof from === \"function\") {\n for (let key of __getOwnPropNames(from))\n if (!__hasOwnProp.call(to, key) && key !== except)\n __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });\n }\n return to;\n};\nvar __toCommonJS = (mod) => __copyProps(__defProp({}, \"__esModule\", { value: true }), mod);\nvar Progress_exports = {};\n__export(Progress_exports, {\n Progress: () => Progress,\n ProgressFrame: () => ProgressFrame,\n ProgressIndicator: () => ProgressIndicator,\n ProgressIndicatorFrame: () => ProgressIndicatorFrame,\n createProgressScope: () => createProgressScope\n});\nmodule.exports = __toCommonJS(Progress_exports);\nvar import_jsx_runtime = require(\"react/jsx-runtime\");\nvar import_core = require(\"@tamagui/core\");\nvar import_create_context = require(\"@tamagui/create-context\");\nvar import_get_token = require(\"@tamagui/get-token\");\nvar import_helpers = require(\"@tamagui/helpers\");\nvar import_stacks = require(\"@tamagui/stacks\");\nvar import_react = require(\"react\");\nvar PROGRESS_NAME = \"Progress\";\nvar [createProgressContext, createProgressScope] = (0, import_create_context.createContextScope)(PROGRESS_NAME);\nvar [ProgressProvider, useProgressContext] = createProgressContext(PROGRESS_NAME);\nvar INDICATOR_NAME = \"ProgressIndicator\";\nvar ProgressIndicatorFrame = (0, import_core.styled)(import_stacks.YStack, {\n displayName: INDICATOR_NAME,\n height: \"100%\",\n width: \"100%\"\n});\nvar ProgressIndicator = (0, import_core.createStyledHOC)(ProgressIndicatorFrame, function ProgressIndicator2(props, forwardedRef) {\n var { __scopeProgress, transition, ...indicatorProps } = props;\n var context = useProgressContext(INDICATOR_NAME, __scopeProgress);\n var _context_value;\n var progressRatio = ((_context_value = context.value) !== null && _context_value !== void 0 ? _context_value : 0) / context.max;\n var x;\n if (import_core.isWeb) {\n x = `${-100 + progressRatio * 50}%`;\n } else {\n var baseWidth = context.width || 0;\n x = Math.ceil(-baseWidth * (2 - progressRatio));\n }\n var _context_value1;\n return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProgressIndicatorFrame, {\n \"data-state\": getProgressState(context.value, context.max),\n \"data-value\": (_context_value1 = context.value) !== null && _context_value1 !== void 0 ? _context_value1 : void 0,\n \"data-max\": context.max,\n x,\n width: \"200%\",\n ...!import_core.isWeb && context.width === 0 && {\n opacity: 0\n },\n ...indicatorProps,\n ref: forwardedRef,\n // only the indicator's slide transitions; `width` is a layout jump\n transition: !import_core.isWeb && !context.width ? null : {\n transform: transition\n }\n });\n});\nfunction defaultGetValueLabel(value, max) {\n return `${Math.round(value / max * 100)}%`;\n}\nfunction getProgressState(value, maxValue) {\n return value == null ? \"indeterminate\" : value === maxValue ? \"complete\" : \"loading\";\n}\nfunction isNumber(value) {\n return typeof value === \"number\";\n}\nfunction isValidMaxNumber(max) {\n return isNumber(max) && !Number.isNaN(max) && max > 0;\n}\nfunction isValidValueNumber(value, max) {\n return isNumber(value) && !Number.isNaN(value) && value <= max && value >= 0;\n}\nvar DEFAULT_MAX = 100;\nvar progressTrackHeight = {\n xs: 4,\n sm: 6,\n md: 9,\n lg: 12,\n xl: 16\n};\nvar resolveProgressSize = function(val) {\n if (typeof val === \"string\" && val in progressTrackHeight) {\n return progressTrackHeight[val];\n }\n var resolved = Number((0, import_core.getVariableValue)((0, import_get_token.getSize)(val === true ? 36 : val)));\n var base = Number.isFinite(resolved) ? resolved : Number((0, import_core.getVariableValue)((0, import_get_token.getSize)(36)));\n return Math.round(base * 0.25);\n};\nvar getProgressSize = import_core.styled.dynamic(function(val) {\n var size = resolveProgressSize(val);\n return {\n height: size,\n minWidth: size * 20,\n width: \"100%\"\n };\n});\nvar ProgressFrame = (0, import_core.styled)(import_stacks.YStack, {\n displayName: \"Progress\",\n overflow: \"hidden\",\n variants: {\n size: getProgressSize\n }\n});\nvar Progress = (0, import_helpers.withStaticProperties)((0, import_core.createStyledHOC)(ProgressFrame, function Progress2(props, forwardedRef) {\n var {\n // @ts-expect-error\n __scopeProgress,\n value: valueProp,\n max: maxProp,\n getValueLabel = defaultGetValueLabel,\n size = true,\n ...progressProps\n } = props;\n var max = isValidMaxNumber(maxProp) ? maxProp : DEFAULT_MAX;\n var value = isValidValueNumber(valueProp, max) ? Math.round(valueProp) : null;\n var valueLabel = isNumber(value) ? getValueLabel(value, max) : void 0;\n var [width, setWidth] = (0, import_react.useState)(0);\n return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProgressProvider, {\n scope: __scopeProgress,\n value,\n max,\n width,\n children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ProgressFrame, {\n \"aria-valuemax\": max,\n \"aria-valuemin\": 0,\n \"aria-valuenow\": isNumber(value) ? value : void 0,\n \"aria-valuetext\": valueLabel,\n // @ts-ignore\n role: \"progressbar\",\n \"data-state\": getProgressState(value, max),\n \"data-value\": value !== null && value !== void 0 ? value : void 0,\n \"data-max\": max,\n size,\n ...progressProps,\n ...!import_core.isWeb && {\n onLayout: function(e) {\n var _progressProps_onLayout;\n var newWidth = Math.round(e.nativeEvent.layout.width);\n if (newWidth !== width) {\n setWidth(newWidth);\n }\n (_progressProps_onLayout = progressProps.onLayout) === null || _progressProps_onLayout === void 0 ? void 0 : _progressProps_onLayout.call(progressProps, e);\n }\n },\n ref: forwardedRef\n })\n });\n}), {\n Indicator: ProgressIndicator\n});\n//# sourceMappingURL=Progress.js.map\n"],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tamagui/progress",
3
- "version": "3.0.0-beta.1351.1",
3
+ "version": "3.0.0-beta.1356.1",
4
4
  "license": "MIT",
5
5
  "source": "src/index.ts",
6
6
  "files": [
@@ -35,15 +35,15 @@
35
35
  "clean:build": "tamagui-build clean:build"
36
36
  },
37
37
  "dependencies": {
38
- "@tamagui/compose-refs": "3.0.0-beta.1351.1",
39
- "@tamagui/core": "3.0.0-beta.1351.1",
40
- "@tamagui/create-context": "3.0.0-beta.1351.1",
41
- "@tamagui/get-token": "3.0.0-beta.1351.1",
42
- "@tamagui/helpers": "3.0.0-beta.1351.1",
43
- "@tamagui/stacks": "3.0.0-beta.1351.1"
38
+ "@tamagui/compose-refs": "3.0.0-beta.1356.1",
39
+ "@tamagui/core": "3.0.0-beta.1356.1",
40
+ "@tamagui/create-context": "3.0.0-beta.1356.1",
41
+ "@tamagui/get-token": "3.0.0-beta.1356.1",
42
+ "@tamagui/helpers": "3.0.0-beta.1356.1",
43
+ "@tamagui/stacks": "3.0.0-beta.1356.1"
44
44
  },
45
45
  "devDependencies": {
46
- "@tamagui/build": "3.0.0-beta.1351.1",
46
+ "@tamagui/build": "3.0.0-beta.1356.1",
47
47
  "react": "19.2.3",
48
48
  "react-native": "0.86.2"
49
49
  },
package/src/Progress.tsx CHANGED
@@ -1,7 +1,7 @@
1
1
  // forked from Radix UI
2
2
  // https://github.com/radix-ui/primitives/blob/main/packages/react/progress/src/Progress.tsx
3
3
 
4
- import type { GetProps } from '@tamagui/core'
4
+ import type { GetProps, SizeTokens } from '@tamagui/core'
5
5
  import { createStyledHOC, getVariableValue, isWeb, styled } from '@tamagui/core'
6
6
  import type { Scope } from '@tamagui/create-context'
7
7
  import { createContextScope } from '@tamagui/create-context'
@@ -114,6 +114,52 @@ type ScopedProps<P> = P & { __scopeProgress?: Scope }
114
114
 
115
115
  type ProgressState = 'indeterminate' | 'complete' | 'loading'
116
116
 
117
+ export type ProgressSize =
118
+ | 'xs'
119
+ | 'sm'
120
+ | 'md'
121
+ | 'lg'
122
+ | 'xl'
123
+ | SizeTokens
124
+ | number
125
+ | boolean
126
+
127
+ // the track is a thin bar: named rungs on the xs-xl control ladder, like the
128
+ // slider track. md is the historical default track (size token 36 at quarter
129
+ // scale), so `true` and `md` agree and existing numeric sizes keep their px.
130
+ const progressTrackHeight = {
131
+ xs: 4,
132
+ sm: 6,
133
+ md: 9,
134
+ lg: 12,
135
+ xl: 16,
136
+ } as const
137
+
138
+ const resolveProgressSize = (val: ProgressSize): number => {
139
+ if (typeof val === 'string' && val in progressTrackHeight) {
140
+ return progressTrackHeight[val as keyof typeof progressTrackHeight]
141
+ }
142
+ // getSize hands back the key itself when it is not in the size scale, so an
143
+ // unresolvable key would multiply to NaN here. A NaN height reads as no
144
+ // height at all, and the Indicator inside asks for 100% of it, so the track
145
+ // stops being a bar and fills whatever it is in. Fall back to the same token
146
+ // `true` uses.
147
+ const resolved = Number(getVariableValue(getSize(val === true ? 36 : val)))
148
+ const base = Number.isFinite(resolved)
149
+ ? resolved
150
+ : Number(getVariableValue(getSize(36)))
151
+ return Math.round(base * 0.25)
152
+ }
153
+
154
+ const getProgressSize = styled.dynamic<ProgressSize>((val) => {
155
+ const size = resolveProgressSize(val)
156
+ return {
157
+ height: size,
158
+ minWidth: size * 20,
159
+ width: '100%',
160
+ }
161
+ })
162
+
117
163
  // Unstyled Progress frame: the clip (overflow hidden) + the size mechanism
118
164
  // (size-derived track height) only. The pill radius and theme background live in
119
165
  // the tamagui skin (code/ui/tamagui/src/components/Progress.tsx).
@@ -122,14 +168,7 @@ export const ProgressFrame = styled(YStack, {
122
168
  overflow: 'hidden',
123
169
 
124
170
  variants: {
125
- size: styled.dynamic<any>((val) => {
126
- const size = Math.round(getVariableValue(getSize(val === true ? 36 : val)) * 0.25)
127
- return {
128
- height: size,
129
- minWidth: getVariableValue(size) * 20,
130
- width: '100%',
131
- }
132
- }),
171
+ size: getProgressSize,
133
172
  } as const,
134
173
  })
135
174
 
package/types/Progress.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { GetProps } from '@tamagui/core';
1
+ import type { GetProps, SizeTokens } from '@tamagui/core';
2
2
  import type { Scope } from '@tamagui/create-context';
3
3
  declare const createProgressScope: import("@tamagui/create-context").CreateScope;
4
4
  export declare const ProgressIndicatorFrame: import("react").FunctionComponent<Omit<import("@tamagui/core").RNTamaguiViewNonStyleProps, keyof import("@tamagui/core").StackStyleBase> & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase> & import("@tamagui/core").WithFlatVariantValues<{}> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase>> & {
@@ -12,15 +12,16 @@ declare const ProgressIndicator: import("@tamagui/core").TamaguiComponent<Omit<i
12
12
  }, import("@tamagui/react-native-types/src").View | (HTMLElement & import("@tamagui/core").TamaguiElementMethods), import("@tamagui/core").RNTamaguiViewNonStyleProps & Omit<import("@tamagui/core").RNTamaguiViewNonStyleProps, keyof import("@tamagui/core").StackStyleBase> & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase> & import("@tamagui/core").WithFlatVariantValues<{}> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase>> & {
13
13
  __scopeProgress?: Scope;
14
14
  }, import("@tamagui/core").StackStyleBase, {}, import("@tamagui/core").StaticConfigPublic>;
15
+ export type ProgressSize = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | SizeTokens | number | boolean;
15
16
  export declare const ProgressFrame: import("react").FunctionComponent<Omit<import("@tamagui/core").RNTamaguiViewNonStyleProps, "size" | keyof import("@tamagui/core").StackStyleBase> & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase> & import("@tamagui/core").WithFlatVariantValues<{
16
- size?: any;
17
+ size?: ProgressSize | undefined;
17
18
  }> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase>> & {
18
19
  ref?: import("react").Ref<import("@tamagui/core").TamaguiElement> | undefined;
19
20
  }> & import("@tamagui/core").StaticComponentObject<import("@tamagui/core").TamaDefer, import("@tamagui/core").TamaguiElement, import("@tamagui/core").RNTamaguiViewNonStyleProps, import("@tamagui/core").StackStyleBase, {
20
- size?: any;
21
+ size?: ProgressSize | undefined;
21
22
  }, import("@tamagui/core").StaticConfigPublic> & Omit<import("@tamagui/core").StaticConfigPublic, "staticConfig"> & {
22
23
  __tama: [import("@tamagui/core").TamaDefer, import("@tamagui/core").TamaguiElement, import("@tamagui/core").RNTamaguiViewNonStyleProps, import("@tamagui/core").StackStyleBase, {
23
- size?: any;
24
+ size?: ProgressSize | undefined;
24
25
  }, import("@tamagui/core").StaticConfigPublic];
25
26
  };
26
27
  export interface ProgressExtraProps {
@@ -30,28 +31,28 @@ export interface ProgressExtraProps {
30
31
  }
31
32
  export type ProgressProps = GetProps<typeof ProgressFrame> & ProgressExtraProps;
32
33
  declare const Progress: import("react").FunctionComponent<Omit<import("@tamagui/core").GetFinalProps<import("@tamagui/core").RNTamaguiViewNonStyleProps, import("@tamagui/core").StackStyleBase, {
33
- size?: any;
34
+ size?: ProgressSize | undefined;
34
35
  }>, "size" | keyof ProgressExtraProps | keyof import("@tamagui/core").RNTamaguiViewNonStyleProps | keyof import("@tamagui/core").StackStyleBase> & Omit<import("@tamagui/core").RNTamaguiViewNonStyleProps, "size" | keyof import("@tamagui/core").StackStyleBase> & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase> & import("@tamagui/core").WithFlatVariantValues<{
35
- size?: any;
36
+ size?: ProgressSize | undefined;
36
37
  }> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase>> & ProgressExtraProps & {
37
38
  ref?: import("react").Ref<import("@tamagui/react-native-types/src").View | (HTMLElement & import("@tamagui/core").TamaguiElementMethods)> | undefined;
38
39
  }> & import("@tamagui/core").StaticComponentObject<Omit<import("@tamagui/core").GetFinalProps<import("@tamagui/core").RNTamaguiViewNonStyleProps, import("@tamagui/core").StackStyleBase, {
39
- size?: any;
40
+ size?: ProgressSize | undefined;
40
41
  }>, "size" | keyof ProgressExtraProps | keyof import("@tamagui/core").RNTamaguiViewNonStyleProps | keyof import("@tamagui/core").StackStyleBase> & Omit<import("@tamagui/core").RNTamaguiViewNonStyleProps, "size" | keyof import("@tamagui/core").StackStyleBase> & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase> & import("@tamagui/core").WithFlatVariantValues<{
41
- size?: any;
42
+ size?: ProgressSize | undefined;
42
43
  }> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase>> & ProgressExtraProps, import("@tamagui/react-native-types/src").View | (HTMLElement & import("@tamagui/core").TamaguiElementMethods), import("@tamagui/core").RNTamaguiViewNonStyleProps & Omit<import("@tamagui/core").RNTamaguiViewNonStyleProps, "size" | keyof import("@tamagui/core").StackStyleBase> & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase> & import("@tamagui/core").WithFlatVariantValues<{
43
- size?: any;
44
+ size?: ProgressSize | undefined;
44
45
  }> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase>> & ProgressExtraProps, import("@tamagui/core").StackStyleBase, {
45
- size?: any;
46
+ size?: ProgressSize | undefined;
46
47
  }, import("@tamagui/core").StaticConfigPublic> & Omit<import("@tamagui/core").StaticConfigPublic, "staticConfig"> & {
47
48
  __tama: [Omit<import("@tamagui/core").GetFinalProps<import("@tamagui/core").RNTamaguiViewNonStyleProps, import("@tamagui/core").StackStyleBase, {
48
- size?: any;
49
+ size?: ProgressSize | undefined;
49
50
  }>, "size" | keyof ProgressExtraProps | keyof import("@tamagui/core").RNTamaguiViewNonStyleProps | keyof import("@tamagui/core").StackStyleBase> & Omit<import("@tamagui/core").RNTamaguiViewNonStyleProps, "size" | keyof import("@tamagui/core").StackStyleBase> & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase> & import("@tamagui/core").WithFlatVariantValues<{
50
- size?: any;
51
+ size?: ProgressSize | undefined;
51
52
  }> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase>> & ProgressExtraProps, import("@tamagui/react-native-types/src").View | (HTMLElement & import("@tamagui/core").TamaguiElementMethods), import("@tamagui/core").RNTamaguiViewNonStyleProps & Omit<import("@tamagui/core").RNTamaguiViewNonStyleProps, "size" | keyof import("@tamagui/core").StackStyleBase> & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase> & import("@tamagui/core").WithFlatVariantValues<{
52
- size?: any;
53
+ size?: ProgressSize | undefined;
53
54
  }> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase>> & ProgressExtraProps, import("@tamagui/core").StackStyleBase, {
54
- size?: any;
55
+ size?: ProgressSize | undefined;
55
56
  }, import("@tamagui/core").StaticConfigPublic];
56
57
  } & {
57
58
  Indicator: import("@tamagui/core").TamaguiComponent<Omit<import("@tamagui/core").GetFinalProps<import("@tamagui/core").RNTamaguiViewNonStyleProps, import("@tamagui/core").StackStyleBase, {}>, "__scopeProgress" | keyof import("@tamagui/core").RNTamaguiViewNonStyleProps | keyof import("@tamagui/core").StackStyleBase> & Omit<import("@tamagui/core").RNTamaguiViewNonStyleProps, keyof import("@tamagui/core").StackStyleBase> & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase> & import("@tamagui/core").WithFlatVariantValues<{}> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStyleBase>> & {
package/types/Progress.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Progress.d.ts","sourceRoot":"","sources":["../src/Progress.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAE7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AASpD,QAAA,MAA8B,mBAAmB,+CAAqC,CAAA;AAiBtF,eAAO,MAAM,sBAAsB;;;;CAIjC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,QAAQ,CAAC,OAAO,sBAAsB,CAAC,CAAA;AAE5E,QAAA,MAAM,iBAAiB;sBAyEuB,KAAK;;;0FAjClD,CAAA;AAwCD,eAAO,MAAM,aAAa;;;;;;;;;;CAcxB,CAAA;AAEF,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IACjC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,aAAa,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CACnD;AAED,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,aAAa,CAAC,GAAG,kBAAkB,CAAA;AAE/E,QAAA,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;0BA/BgC,KAAK;;;;CAiFlD,CAAA;AAED,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAA"}
1
+ {"version":3,"file":"Progress.d.ts","sourceRoot":"","sources":["../src/Progress.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAEzD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AASpD,QAAA,MAA8B,mBAAmB,+CAAqC,CAAA;AAiBtF,eAAO,MAAM,sBAAsB;;;;CAIjC,CAAA;AAEF,MAAM,MAAM,sBAAsB,GAAG,QAAQ,CAAC,OAAO,sBAAsB,CAAC,CAAA;AAE5E,QAAA,MAAM,iBAAiB;sBAyEuB,KAAK;;;0FAjClD,CAAA;AAqCD,MAAM,MAAM,YAAY,GACpB,IAAI,GACJ,IAAI,GACJ,IAAI,GACJ,IAAI,GACJ,IAAI,GACJ,UAAU,GACV,MAAM,GACN,OAAO,CAAA;AAyCX,eAAO,MAAM,aAAa;;;;;;;;;;CAOxB,CAAA;AAEF,MAAM,WAAW,kBAAkB;IACjC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IACjC,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,aAAa,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CACnD;AAED,MAAM,MAAM,aAAa,GAAG,QAAQ,CAAC,OAAO,aAAa,CAAC,GAAG,kBAAkB,CAAA;AAE/E,QAAA,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;0BAtEgC,KAAK;;;;CAwHlD,CAAA;AAED,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,iBAAiB,EAAE,CAAA"}