@fluentui-react-native/stack 0.8.16 → 0.9.1

package/lib-commonjs/Stack.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Stack.types.d.ts","sourceRoot":"","sources":["../src/Stack.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzD,OAAO,KAAK,EAAE,sBAAsB,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AACvG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAEzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEnE,eAAO,MAAM,SAAS,aAAa,CAAC;AAEpC;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,SAAS,CAAC,gBAAgB,CAAC,GAAG,OAAO,GAAG,KAAK,CAAC;AAEtE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,KAAK,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;CAChD;AAED;;;GAGG;AACH,MAAM,WAAW,YAAa,SAAQ,UAAU,EAAE,sBAAsB,EAAE,aAAa;IACrF;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAE9B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAE5B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAE3B;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAE1B;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,eAAe,CAAC,EAAE,SAAS,CAAC;IAE5B;;OAEG;IACH,aAAa,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAExB;;;;OAIG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,WAAY,SAAQ,YAAY,EAAE,SAAS;CAAG;AAE/D,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,SAAS,CAAC;CAClB,CAAC;AAEF,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,EAAE,eAAe,CAAC;IAC3B,OAAO,EAAE,aAAa,CAAC;IACvB,KAAK,EAAE;QACL,GAAG,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;QACxB,UAAU,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;QACtC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;KAC3B,CAAC;CACH;AAED,MAAM,MAAM,gBAAgB,GAAG,WAAW,CAAC,eAAe,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC"}
+{"version":3,"file":"Stack.types.d.ts","sourceRoot":"","sources":["../src/Stack.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAEzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,KAAK,EAAE,sBAAsB,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AACvG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAEzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAEnE,eAAO,MAAM,SAAS,aAAa,CAAC;AAEpC;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,SAAS,CAAC,gBAAgB,CAAC,GAAG,OAAO,GAAG,KAAK,CAAC;AAEtE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,KAAK,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;CAChD;AAED,KAAK,eAAe,GAAG,GAAG,MAAM,IAAI,GAAG,GAAG,MAAM,EAAE,GAAG,MAAM,OAAO,CAAC;AAEnE;;;GAGG;AACH,MAAM,WAAW,YAAa,SAAQ,UAAU,EAAE,sBAAsB,EAAE,aAAa;IACrF;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,GAAG,eAAe,GAAG,GAAG,eAAe,IAAI,eAAe,EAAE,CAAC;IAEjF;;OAEG;IACH,SAAS,CAAC,EAAE,cAAc,CAAC;IAE3B;;OAEG;IACH,QAAQ,CAAC,EAAE,cAAc,CAAC;IAE1B;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,GAAG,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC;IAEjD;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IAErB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;OAEG;IACH,eAAe,CAAC,EAAE,SAAS,CAAC;IAE5B;;OAEG;IACH,aAAa,CAAC,EAAE,SAAS,CAAC;IAE1B;;;;;OAKG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;OAGG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IAExB;;;;OAIG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,WAAY,SAAQ,YAAY,EAAE,SAAS;CAAG;AAE/D,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,SAAS,CAAC;CAClB,CAAC;AAEF,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,WAAW,CAAC;IACnB,MAAM,EAAE,YAAY,CAAC;IACrB,SAAS,EAAE,eAAe,CAAC;IAC3B,OAAO,EAAE,aAAa,CAAC;IACvB,KAAK,EAAE;QACL,GAAG,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;QACxB,UAAU,EAAE,WAAW,CAAC,YAAY,CAAC,CAAC;QACtC,IAAI,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;KAC3B,CAAC;CACH;AAED,MAAM,MAAM,gBAAgB,GAAG,WAAW,CAAC,eAAe,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC"}

package/lib-commonjs/Stack.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"Stack.types.js","sourceRoot":"","sources":["../src/Stack.types.ts"],"names":[],"mappings":";;;AAOa,QAAA,SAAS,GAAG,UAAU,CAAC"}
+{"version":3,"file":"Stack.types.js","sourceRoot":"","sources":["../src/Stack.types.ts"],"names":[],"mappings":";;;AAQa,QAAA,SAAS,GAAG,UAAU,CAAC"}

package/lib-commonjs/StackItem/StackItem.types.d.ts

@@ -1,4 +1,4 @@
-import type { ViewProps } from 'react-native';
+import type { DimensionValue, ViewProps } from 'react-native';
 export declare const stackItemName = "RNFStackItem";
 /**
  * Stack item props
@@ -7,11 +7,11 @@ export interface IStackItemTokens extends ViewProps {
     /**
      * Defines the margin to be applied to the StackItem relative to its container.
      */
-    margin?: number | string;
+    margin?: DimensionValue;
     /**
      * Defines the padding to be applied to the StackItem contents relative to its border.
      */
-    padding?: number | string;
+    padding?: DimensionValue;
     /**
      * Defines how much to grow the StackItem in proportion to its siblings.
      */

package/lib-commonjs/StackItem/StackItem.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StackItem.types.d.ts","sourceRoot":"","sources":["../../src/StackItem/StackItem.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,eAAO,MAAM,aAAa,iBAAiB,CAAC;AAE5C;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAEzB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;IAE1D;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;IAE5D;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAC;IAErE;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,eAAe,GAAG,gBAAgB,GAAG,SAAS,CAAC;AAE3D,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,eAAe,CAAC;IACvB,SAAS,EAAE;QACT,IAAI,EAAE,SAAS,CAAC;KACjB,CAAC;IACF,MAAM,EAAE,gBAAgB,CAAC;CAC1B"}
+{"version":3,"file":"StackItem.types.d.ts","sourceRoot":"","sources":["../../src/StackItem/StackItem.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9D,eAAO,MAAM,aAAa,iBAAiB,CAAC;AAE5C;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IACjD;;OAEG;IACH,MAAM,CAAC,EAAE,cAAc,CAAC;IAExB;;OAEG;IACH,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;IAE1D;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;IAE5D;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IAExB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,GAAG,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAC;IAErE;;;OAGG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACzB;AAED,MAAM,MAAM,eAAe,GAAG,gBAAgB,GAAG,SAAS,CAAC;AAE3D,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,eAAe,CAAC;IACvB,SAAS,EAAE;QACT,IAAI,EAAE,SAAS,CAAC;KACjB,CAAC;IACF,MAAM,EAAE,gBAAgB,CAAC;CAC1B"}

package/lib-commonjs/StackUtils.d.ts

@@ -1,26 +1,20 @@
-import type { Theme } from '@fluentui-react-native/framework';
+import type { Spacing, Theme } from '@fluentui-react-native/framework';
 export interface IParseGapResult {
-    rowGap: {
-        value: number;
-        unit: string;
-    };
-    columnGap: {
-        value: number;
-        unit: string;
-    };
+    rowGap: number;
+    columnGap: number;
 }
+type SpacingGapValue = `${number}px` | `${number}` | keyof Spacing;
 /**
  * Takes in a gap size in either a CSS-style format (e.g. 10 or "10px")
  *  or a key of a themed spacing value (e.g. "s1").
  * Returns the separate numerical value of the padding (e.g. 10)
  *  and the CSS unit (e.g. "px").
  */
-export declare function parseGap(gap: number | string | undefined, theme: Theme): IParseGapResult;
+export declare function parseGap(gap: number | SpacingGapValue | `${SpacingGapValue} ${SpacingGapValue}` | undefined, theme: Theme): IParseGapResult;
 /**
- * Takes in a padding in a CSS-style format (e.g. 10, "10px", "10px 10px", etc.)
- *  where the separate padding values can also be the key of a themed spacing value
- *  (e.g. "s1 m", "10px l1 20px l2", etc.).
- * Returns a CSS-style padding.
+ * Takes in a padding in a CSS-style format (e.g. 10, "10px"), or a key of a themed spacing value
+ *  (e.g. "s1")
  */
-export declare function parsePadding(padding: number | string | undefined, theme: Theme): number | string | undefined;
+export declare function parsePadding(padding: keyof Spacing | number | `${number}px` | undefined, theme: Theme): number | undefined;
+export {};
 //# sourceMappingURL=StackUtils.d.ts.map

package/lib-commonjs/StackUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StackUtils.d.ts","sourceRoot":"","sources":["../src/StackUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAkC9D,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACxC,SAAS,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;CAC5C;AAED;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,KAAK,GAAG,eAAe,CAsBxF;AAED;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,MAAM,GAAG,SAAS,CAa5G"}
+{"version":3,"file":"StackUtils.d.ts","sourceRoot":"","sources":["../src/StackUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAuBvE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,KAAK,eAAe,GAAG,GAAG,MAAM,IAAI,GAAG,GAAG,MAAM,EAAE,GAAG,MAAM,OAAO,CAAC;AAEnE;;;;;GAKG;AACH,wBAAgB,QAAQ,CACtB,GAAG,EAAE,MAAM,GAAG,eAAe,GAAG,GAAG,eAAe,IAAI,eAAe,EAAE,GAAG,SAAS,EACnF,KAAK,EAAE,KAAK,GACX,eAAe,CAsBjB;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,OAAO,GAAG,MAAM,GAAG,GAAG,MAAM,IAAI,GAAG,SAAS,EAAE,KAAK,EAAE,KAAK,GAAG,MAAM,GAAG,SAAS,CAM1H"}

package/lib-commonjs/StackUtils.js

@@ -9,23 +9,14 @@ var _spacingKey = 'spacing';
 // Helper function that converts a themed spacing key (if given) to the corresponding themed spacing value.
 var _getThemedSpacing = function (space, theme) {
     var spacing = theme[_spacingKey];
-    if (spacing && typeof spacing === 'object') {
+    if (spacing && typeof spacing === 'object' && typeof space === 'string') {
         if (spacing.hasOwnProperty(space)) {
-            return spacing[space];
+            space = spacing[space];
         }
     }
-    return space;
-};
-// Helper function that takes a gap as a string and converts it into a { value, unit } representation.
-var _getValueUnitGap = function (gap) {
-    var numericalPart = parseFloat(gap);
+    var numericalPart = parseFloat(space);
     var numericalValue = isNaN(numericalPart) ? 0 : numericalPart;
-    var numericalString = isNaN(numericalPart) ? '' : numericalPart.toString();
-    var unitPart = gap.substring(numericalString.toString().length);
-    return {
-        value: numericalValue,
-        unit: unitPart || 'px',
-    };
+    return numericalValue;
 };
 /**
  * Takes in a gap size in either a CSS-style format (e.g. 10 or "10px")
@@ -35,22 +26,22 @@ var _getValueUnitGap = function (gap) {
  */
 function parseGap(gap, theme) {
     var result = {
-        rowGap: { value: 0, unit: 'px' },
-        columnGap: { value: 0, unit: 'px' },
+        rowGap: 0,
+        columnGap: 0,
     };
     if (gap) {
         if (typeof gap === 'number') {
-            result.rowGap.value = gap;
-            result.columnGap.value = gap;
+            result.rowGap = gap;
+            result.columnGap = gap;
         }
         else {
             var splitGap = gap.split(' ');
             if (splitGap.length === 2) {
-                result.rowGap = _getValueUnitGap(_getThemedSpacing(splitGap[0], theme));
-                result.columnGap = _getValueUnitGap(_getThemedSpacing(splitGap[1], theme));
+                result.rowGap = _getThemedSpacing(splitGap[0], theme);
+                result.columnGap = _getThemedSpacing(splitGap[1], theme);
             }
             else {
-                var calculatedGap = _getValueUnitGap(_getThemedSpacing(gap, theme));
+                var calculatedGap = _getThemedSpacing(gap, theme);
                 result.rowGap = calculatedGap;
                 result.columnGap = calculatedGap;
             }
@@ -60,22 +51,14 @@ function parseGap(gap, theme) {
 }
 exports.parseGap = parseGap;
 /**
- * Takes in a padding in a CSS-style format (e.g. 10, "10px", "10px 10px", etc.)
- *  where the separate padding values can also be the key of a themed spacing value
- *  (e.g. "s1 m", "10px l1 20px l2", etc.).
- * Returns a CSS-style padding.
+ * Takes in a padding in a CSS-style format (e.g. 10, "10px"), or a key of a themed spacing value
+ *  (e.g. "s1")
  */
 function parsePadding(padding, theme) {
-    if (padding === undefined || typeof padding === 'number' || padding === '') {
+    if (padding === undefined || typeof padding === 'number') {
         return padding;
     }
-    var paddingValues = padding.split(' ');
-    if (paddingValues.length < 2) {
-        return _getThemedSpacing(padding, theme);
-    }
-    return paddingValues.reduce(function (padding1, padding2) {
-        return _getThemedSpacing(padding1, theme) + ' ' + _getThemedSpacing(padding2, theme);
-    });
+    return _getThemedSpacing(padding, theme);
 }
 exports.parsePadding = parsePadding;
 //# sourceMappingURL=StackUtils.js.map

package/lib-commonjs/StackUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"StackUtils.js","sourceRoot":"","sources":["../src/StackUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"StackUtils.js","sourceRoot":"","sources":["../src/StackUtils.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AAEH,gFAAgF;AAChF,IAAM,WAAW,GAAG,SAAS,CAAC;AAE9B,2GAA2G;AAC3G,IAAM,iBAAiB,GAAG,UAAC,KAAkD,EAAE,KAAY;IACzF,IAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;IACnC,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;QACvE,IAAI,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;YACjC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;SACxB;KACF;IAED,IAAM,aAAa,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IACxC,IAAM,cAAc,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;IAChE,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AASF;;;;;GAKG;AACH,SAAgB,QAAQ,CACtB,GAAmF,EACnF,KAAY;IAEZ,IAAM,MAAM,GAAoB;QAC9B,MAAM,EAAE,CAAC;QACT,SAAS,EAAE,CAAC;KACb,CAAC;IACF,IAAI,GAAG,EAAE;QACP,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC;YACpB,MAAM,CAAC,SAAS,GAAG,GAAG,CAAC;SACxB;aAAM;YACL,IAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAChC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;gBACzB,MAAM,CAAC,MAAM,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAoB,EAAE,KAAK,CAAC,CAAC;gBACzE,MAAM,CAAC,SAAS,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC,CAAoB,EAAE,KAAK,CAAC,CAAC;aAC7E;iBAAM;gBACL,IAAM,aAAa,GAAG,iBAAiB,CAAC,GAAsB,EAAE,KAAK,CAAC,CAAC;gBACvE,MAAM,CAAC,MAAM,GAAG,aAAa,CAAC;gBAC9B,MAAM,CAAC,SAAS,GAAG,aAAa,CAAC;aAClC;SACF;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAzBD,4BAyBC;AAED;;;GAGG;AACH,SAAgB,YAAY,CAAC,OAA2D,EAAE,KAAY;IACpG,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QACxD,OAAO,OAA6B,CAAC;KACtC;IAED,OAAO,iBAAiB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAC3C,CAAC;AAND,oCAMC"}

package/lib-commonjs/StackUtils.test.win32.js

@@ -9,9 +9,6 @@ describe('StackUtils', function () {
         it('returns a default value when given undefined', function () {
             expect((0, StackUtils_1.parseGap)(undefined, theme)).toEqual({ rowGap: { value: 0, unit: 'px' }, columnGap: { value: 0, unit: 'px' } });
         });
-        it('returns a default value when given an empty string', function () {
-            expect((0, StackUtils_1.parseGap)('', theme)).toEqual({ rowGap: { value: 0, unit: 'px' }, columnGap: { value: 0, unit: 'px' } });
-        });
         it('returns a value with px when given a number', function () {
             expect((0, StackUtils_1.parseGap)(10, theme)).toEqual({ rowGap: { value: 10, unit: 'px' }, columnGap: { value: 10, unit: 'px' } });
         });
@@ -21,27 +18,12 @@ describe('StackUtils', function () {
         it('can parse a string with a float', function () {
             expect((0, StackUtils_1.parseGap)('20.5px', theme)).toEqual({ rowGap: { value: 20.5, unit: 'px' }, columnGap: { value: 20.5, unit: 'px' } });
         });
-        it('can parse a string with em', function () {
-            expect((0, StackUtils_1.parseGap)('5em', theme)).toEqual({ rowGap: { value: 5, unit: 'em' }, columnGap: { value: 5, unit: 'em' } });
-        });
-        it('can parse a string with percentage', function () {
-            expect((0, StackUtils_1.parseGap)('100%', theme)).toEqual({ rowGap: { value: 100, unit: '%' }, columnGap: { value: 100, unit: '%' } });
-        });
-        it('can parse a string with no numerical part', function () {
-            expect((0, StackUtils_1.parseGap)('px', theme)).toEqual({ rowGap: { value: 0, unit: 'px' }, columnGap: { value: 0, unit: 'px' } });
-        });
-        it('defaults to px with given a string with no units', function () {
-            expect((0, StackUtils_1.parseGap)('16', theme)).toEqual({ rowGap: { value: 16, unit: 'px' }, columnGap: { value: 16, unit: 'px' } });
-        });
         it('parses the value from the theme when given a spacing key', function () {
             expect((0, StackUtils_1.parseGap)('m', theme)).toEqual({ rowGap: { value: 16, unit: 'em' }, columnGap: { value: 16, unit: 'em' } });
         });
         it('can parse a string with both horizontal and vertical gap', function () {
             expect((0, StackUtils_1.parseGap)('30px 10px', theme)).toEqual({ rowGap: { value: 30, unit: 'px' }, columnGap: { value: 10, unit: 'px' } });
         });
-        it('can parse a string with horizontal and vertical gap with different units', function () {
-            expect((0, StackUtils_1.parseGap)('50px 15%', theme)).toEqual({ rowGap: { value: 50, unit: 'px' }, columnGap: { value: 15, unit: '%' } });
-        });
         it('defaults to px with a string with horizontal and vertical gap with no units', function () {
             expect((0, StackUtils_1.parseGap)('50 30', theme)).toEqual({ rowGap: { value: 50, unit: 'px' }, columnGap: { value: 30, unit: 'px' } });
         });
@@ -62,28 +44,12 @@ describe('StackUtils', function () {
         it('returns its argument when given undefined, a number, or an empty string', function () {
             expect((0, StackUtils_1.parsePadding)(undefined, theme)).toEqual(undefined);
             expect((0, StackUtils_1.parsePadding)(0, theme)).toEqual(0);
-            expect((0, StackUtils_1.parsePadding)('', theme)).toEqual('');
         });
         it('returns its argument when given a CSS-style padding', function () {
             expect((0, StackUtils_1.parsePadding)('10px', theme)).toEqual('10px');
-            expect((0, StackUtils_1.parsePadding)('10px 20px', theme)).toEqual('10px 20px');
-            expect((0, StackUtils_1.parsePadding)('10px 20px 30px', theme)).toEqual('10px 20px 30px');
-            expect((0, StackUtils_1.parsePadding)('10px 20px 30px 40px', theme)).toEqual('10px 20px 30px 40px');
         });
         it('converts themed spacing keys to CSS-style paddings', function () {
             expect((0, StackUtils_1.parsePadding)('s2', theme)).toEqual('5px');
-            expect((0, StackUtils_1.parsePadding)('s1 m', theme)).toEqual('10px 15px');
-            expect((0, StackUtils_1.parsePadding)('m l1 l2', theme)).toEqual('15px 20px 25px');
-            expect((0, StackUtils_1.parsePadding)('s2 s1 m l1', theme)).toEqual('5px 10px 15px 20px');
-        });
-        it('can mix and match themed and CSS-style paddings', function () {
-            expect((0, StackUtils_1.parsePadding)('s2 10em', theme)).toEqual('5px 10em');
-            expect((0, StackUtils_1.parsePadding)('20% s1', theme)).toEqual('20% 10px');
-            expect((0, StackUtils_1.parsePadding)('m 5vw', theme)).toEqual('15px 5vw');
-            expect((0, StackUtils_1.parsePadding)('l1 10vh l2', theme)).toEqual('20px 10vh 25px');
-            expect((0, StackUtils_1.parsePadding)('20vmin s2 20vmax', theme)).toEqual('20vmin 5px 20vmax');
-            expect((0, StackUtils_1.parsePadding)('m 5em l1 10em', theme)).toEqual('15px 5em 20px 10em');
-            expect((0, StackUtils_1.parsePadding)('1px l2 0px s2', theme)).toEqual('1px 25px 0px 5px');
         });
     });
 });

package/lib-commonjs/StackUtils.test.win32.js.map

@@ -1 +1 @@
-{"version":3,"file":"StackUtils.test.win32.js","sourceRoot":"","sources":["../src/StackUtils.test.win32.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"StackUtils.test.win32.js","sourceRoot":"","sources":["../src/StackUtils.test.win32.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluentui-react-native/stack",
-  "version": "0.8.16",
+  "version": "0.9.1",
   "description": "A cross-platform opinionated Fluent Text component",
   "main": "lib-commonjs/index.js",
   "module": "lib/index.js",
@@ -22,24 +22,25 @@
     "directory": "packages/components/Stack"
   },
   "dependencies": {
-    "@fluentui-react-native/adapters": ">=0.11.3 <1.0.0",
-    "@fluentui-react-native/framework": ">=0.11.10 <1.0.0",
-    "@fluentui-react-native/tokens": ">=0.21.6 <1.0.0",
-    "@uifabricshared/foundation-composable": ">=0.12.2 <1.0.0",
-    "@uifabricshared/foundation-compose": "^1.14.12",
-    "@uifabricshared/foundation-settings": ">=0.13.2 <1.0.0",
-    "@uifabricshared/foundation-tokens": ">=0.13.9 <1.0.0"
+    "@fluentui-react-native/adapters": ">=0.12.0 <1.0.0",
+    "@fluentui-react-native/framework": ">=0.13.0 <1.0.0",
+    "@fluentui-react-native/tokens": ">=0.22.1 <1.0.0",
+    "@uifabricshared/foundation-composable": ">=0.12.3 <1.0.0",
+    "@uifabricshared/foundation-compose": "^1.14.14",
+    "@uifabricshared/foundation-settings": ">=0.14.0 <1.0.0",
+    "@uifabricshared/foundation-tokens": ">=0.14.1 <1.0.0"
   },
   "devDependencies": {
     "@fluentui-react-native/eslint-config-rules": "^0.1.1",
     "@fluentui-react-native/scripts": "^0.1.1",
-    "@fluentui-react-native/text": ">=0.21.14 <1.0.0",
+    "@fluentui-react-native/text": ">=0.22.1 <1.0.0",
+    "@react-native/metro-config": "^0.72.0",
     "react": "18.2.0",
-    "react-native": "^0.71.0"
+    "react-native": "^0.72.0"
   },
   "peerDependencies": {
     "react": "18.2.0",
-    "react-native": "^0.71.0"
+    "react-native": "^0.72.0"
   },
   "author": "",
   "license": "MIT",
@@ -50,7 +51,7 @@
         "microsoft/react-native"
       ],
       "requirements": [
-        "react-native@0.71"
+        "react-native@0.72"
       ],
       "capabilities": [
         "core",

package/src/Stack.tokens.ts

@@ -40,25 +40,20 @@ function _buildInnerStyles(tokenProps: IStackTokens, theme: Theme): ViewProps {
   let innerStyle: ViewStyle | undefined = undefined;
   const childrenGap = tokenProps.childrenGap || tokenProps.gap;
   const { rowGap, columnGap } = parseGap(childrenGap, theme);
-  const horizontalMargin = `${-0.5 * columnGap.value}${columnGap.unit}`;
-  const verticalMargin = `${-0.5 * rowGap.value}${rowGap.unit}`;
 
   if (wrap) {
     innerStyle = {
-      marginLeft: horizontalMargin,
-      marginRight: horizontalMargin,
-      marginTop: verticalMargin,
-      marginBottom: verticalMargin,
+      rowGap: rowGap,
+      columnGap: columnGap,
       padding: parsePadding(padding, theme),
-      width: columnGap.value === 0 ? '100%' : `calc(100% + ${columnGap.value}${columnGap.unit})`,
+      width: '100%',
     };
     _mapAlignment(!!horizontal, horizontalAlign, verticalAlign, innerStyle);
-    const heightToSet = rowGap.value === 0 ? '100%' : `calc(100% + ${rowGap.value}${rowGap.unit})`;
     if (horizontal) {
-      innerStyle.height = heightToSet;
+      innerStyle.height = '100%';
     } else {
-      innerStyle.maxHeight = heightToSet;
-      innerStyle.height = `calc(100% + ${rowGap.value}${rowGap.unit})`;
+      innerStyle.maxHeight = '100%';
+      innerStyle.height = '100%';
     }
   }
   return { style: innerStyle };

package/src/Stack.types.ts

@@ -1,5 +1,6 @@
-import type { ViewStyle, ViewProps } from 'react-native';
+import type { ViewStyle, ViewProps, DimensionValue } from 'react-native';
 
+import type { Spacing } from '@fluentui-react-native/framework';
 import type { IBackgroundColorTokens, IBorderTokens, FontTokens } from '@fluentui-react-native/tokens';
 import type { IRenderData } from '@uifabricshared/foundation-composable';
 
@@ -17,6 +18,8 @@ export interface IStackStatics {
   Item: React.FunctionComponent<IStackItemProps>;
 }
 
+type SpacingGapValue = `${number}px` | `${number}` | keyof Spacing;
+
 /**
  * Tokens from fabric.  Right now they are embedded in the props pending discussions of whether tokens: {} is
  * the right approach
@@ -27,22 +30,22 @@ export interface IStackTokens extends FontTokens, IBackgroundColorTokens, IBorde
    * The property is specified as a value for 'row gap', followed optionally by a value for 'column gap'.
    * If 'column gap' is omitted, it's set to the same value as 'row gap'.
    */
-  childrenGap?: number | string;
+  childrenGap?: number | SpacingGapValue | `${SpacingGapValue} ${SpacingGapValue}`;
 
   /**
    * Defines a maximum height for the Stack.
    */
-  maxHeight?: number | string;
+  maxHeight?: DimensionValue;
 
   /**
    * Defines a maximum width for the Stack.
    */
-  maxWidth?: number | string;
+  maxWidth?: DimensionValue;
 
   /**
    * Defines the padding to be applied to the Stack contents relative to its border.
    */
-  padding?: number | string;
+  padding?: number | `${number}px` | keyof Spacing;
 
   /**
    * Defines whether to render Stack children horizontally.

package/src/StackItem/StackItem.types.ts

@@ -1,4 +1,4 @@
-import type { ViewProps } from 'react-native';
+import type { DimensionValue, ViewProps } from 'react-native';
 
 export const stackItemName = 'RNFStackItem';
 
@@ -9,12 +9,12 @@ export interface IStackItemTokens extends ViewProps {
   /**
    * Defines the margin to be applied to the StackItem relative to its container.
    */
-  margin?: number | string;
+  margin?: DimensionValue;
 
   /**
    * Defines the padding to be applied to the StackItem contents relative to its border.
    */
-  padding?: number | string;
+  padding?: DimensionValue;
   /**
    * Defines how much to grow the StackItem in proportion to its siblings.
    */

package/src/StackUtils.test.win32.ts

@@ -12,10 +12,6 @@ describe('StackUtils', () => {
       expect(parseGap(undefined, theme)).toEqual({ rowGap: { value: 0, unit: 'px' }, columnGap: { value: 0, unit: 'px' } });
     });
 
-    it('returns a default value when given an empty string', () => {
-      expect(parseGap('', theme)).toEqual({ rowGap: { value: 0, unit: 'px' }, columnGap: { value: 0, unit: 'px' } });
-    });
-
     it('returns a value with px when given a number', () => {
       expect(parseGap(10, theme)).toEqual({ rowGap: { value: 10, unit: 'px' }, columnGap: { value: 10, unit: 'px' } });
     });
@@ -28,22 +24,6 @@ describe('StackUtils', () => {
       expect(parseGap('20.5px', theme)).toEqual({ rowGap: { value: 20.5, unit: 'px' }, columnGap: { value: 20.5, unit: 'px' } });
     });
 
-    it('can parse a string with em', () => {
-      expect(parseGap('5em', theme)).toEqual({ rowGap: { value: 5, unit: 'em' }, columnGap: { value: 5, unit: 'em' } });
-    });
-
-    it('can parse a string with percentage', () => {
-      expect(parseGap('100%', theme)).toEqual({ rowGap: { value: 100, unit: '%' }, columnGap: { value: 100, unit: '%' } });
-    });
-
-    it('can parse a string with no numerical part', () => {
-      expect(parseGap('px', theme)).toEqual({ rowGap: { value: 0, unit: 'px' }, columnGap: { value: 0, unit: 'px' } });
-    });
-
-    it('defaults to px with given a string with no units', () => {
-      expect(parseGap('16', theme)).toEqual({ rowGap: { value: 16, unit: 'px' }, columnGap: { value: 16, unit: 'px' } });
-    });
-
     it('parses the value from the theme when given a spacing key', () => {
       expect(parseGap('m', theme)).toEqual({ rowGap: { value: 16, unit: 'em' }, columnGap: { value: 16, unit: 'em' } });
     });
@@ -52,9 +32,6 @@ describe('StackUtils', () => {
       expect(parseGap('30px 10px', theme)).toEqual({ rowGap: { value: 30, unit: 'px' }, columnGap: { value: 10, unit: 'px' } });
     });
 
-    it('can parse a string with horizontal and vertical gap with different units', () => {
-      expect(parseGap('50px 15%', theme)).toEqual({ rowGap: { value: 50, unit: 'px' }, columnGap: { value: 15, unit: '%' } });
-    });
     it('defaults to px with a string with horizontal and vertical gap with no units', () => {
       expect(parseGap('50 30', theme)).toEqual({ rowGap: { value: 50, unit: 'px' }, columnGap: { value: 30, unit: 'px' } });
     });
@@ -78,31 +55,14 @@ describe('StackUtils', () => {
     it('returns its argument when given undefined, a number, or an empty string', () => {
       expect(parsePadding(undefined, theme)).toEqual(undefined);
       expect(parsePadding(0, theme)).toEqual(0);
-      expect(parsePadding('', theme)).toEqual('');
     });
 
     it('returns its argument when given a CSS-style padding', () => {
       expect(parsePadding('10px', theme)).toEqual('10px');
-      expect(parsePadding('10px 20px', theme)).toEqual('10px 20px');
-      expect(parsePadding('10px 20px 30px', theme)).toEqual('10px 20px 30px');
-      expect(parsePadding('10px 20px 30px 40px', theme)).toEqual('10px 20px 30px 40px');
     });
 
     it('converts themed spacing keys to CSS-style paddings', () => {
       expect(parsePadding('s2', theme)).toEqual('5px');
-      expect(parsePadding('s1 m', theme)).toEqual('10px 15px');
-      expect(parsePadding('m l1 l2', theme)).toEqual('15px 20px 25px');
-      expect(parsePadding('s2 s1 m l1', theme)).toEqual('5px 10px 15px 20px');
-    });
-
-    it('can mix and match themed and CSS-style paddings', () => {
-      expect(parsePadding('s2 10em', theme)).toEqual('5px 10em');
-      expect(parsePadding('20% s1', theme)).toEqual('20% 10px');
-      expect(parsePadding('m 5vw', theme)).toEqual('15px 5vw');
-      expect(parsePadding('l1 10vh l2', theme)).toEqual('20px 10vh 25px');
-      expect(parsePadding('20vmin s2 20vmax', theme)).toEqual('20vmin 5px 20vmax');
-      expect(parsePadding('m 5em l1 10em', theme)).toEqual('15px 5em 20px 10em');
-      expect(parsePadding('1px l2 0px s2', theme)).toEqual('1px 25px 0px 5px');
     });
   });
 });

package/src/StackUtils.ts

@@ -1,4 +1,4 @@
-import type { Theme } from '@fluentui-react-native/framework';
+import type { Spacing, Theme } from '@fluentui-react-native/framework';
 
 /**
  * Functions used by Stack components to simplify style-related computations
@@ -8,57 +8,51 @@ import type { Theme } from '@fluentui-react-native/framework';
 const _spacingKey = 'spacing';
 
 // Helper function that converts a themed spacing key (if given) to the corresponding themed spacing value.
-const _getThemedSpacing = (space: string, theme: Theme): string => {
+const _getThemedSpacing = (space: `${number}` | `${number}px` | keyof Spacing, theme: Theme): number => {
   const spacing = theme[_spacingKey];
-  if (spacing && typeof spacing === 'object') {
+  if (spacing && typeof spacing === 'object' && typeof space === 'string') {
     if (spacing.hasOwnProperty(space)) {
-      return spacing[space];
+      space = spacing[space];
     }
   }
-  return space;
-};
 
-// Helper function that takes a gap as a string and converts it into a { value, unit } representation.
-const _getValueUnitGap = (gap: string): { value: number; unit: string } => {
-  const numericalPart = parseFloat(gap);
+  const numericalPart = parseFloat(space);
   const numericalValue = isNaN(numericalPart) ? 0 : numericalPart;
-  const numericalString = isNaN(numericalPart) ? '' : numericalPart.toString();
-
-  const unitPart = gap.substring(numericalString.toString().length);
-
-  return {
-    value: numericalValue,
-    unit: unitPart || 'px',
-  };
+  return numericalValue;
 };
 
 export interface IParseGapResult {
-  rowGap: { value: number; unit: string };
-  columnGap: { value: number; unit: string };
+  rowGap: number;
+  columnGap: number;
 }
 
+type SpacingGapValue = `${number}px` | `${number}` | keyof Spacing;
+
 /**
  * Takes in a gap size in either a CSS-style format (e.g. 10 or "10px")
  *  or a key of a themed spacing value (e.g. "s1").
  * Returns the separate numerical value of the padding (e.g. 10)
  *  and the CSS unit (e.g. "px").
  */
-export function parseGap(gap: number | string | undefined, theme: Theme): IParseGapResult {
+export function parseGap(
+  gap: number | SpacingGapValue | `${SpacingGapValue} ${SpacingGapValue}` | undefined,
+  theme: Theme,
+): IParseGapResult {
   const result: IParseGapResult = {
-    rowGap: { value: 0, unit: 'px' },
-    columnGap: { value: 0, unit: 'px' },
+    rowGap: 0,
+    columnGap: 0,
   };
   if (gap) {
     if (typeof gap === 'number') {
-      result.rowGap.value = gap;
-      result.columnGap.value = gap;
+      result.rowGap = gap;
+      result.columnGap = gap;
     } else {
       const splitGap = gap.split(' ');
       if (splitGap.length === 2) {
-        result.rowGap = _getValueUnitGap(_getThemedSpacing(splitGap[0], theme));
-        result.columnGap = _getValueUnitGap(_getThemedSpacing(splitGap[1], theme));
+        result.rowGap = _getThemedSpacing(splitGap[0] as SpacingGapValue, theme);
+        result.columnGap = _getThemedSpacing(splitGap[1] as SpacingGapValue, theme);
       } else {
-        const calculatedGap = _getValueUnitGap(_getThemedSpacing(gap, theme));
+        const calculatedGap = _getThemedSpacing(gap as SpacingGapValue, theme);
         result.rowGap = calculatedGap;
         result.columnGap = calculatedGap;
       }
@@ -68,22 +62,13 @@ export function parseGap(gap: number | string | undefined, theme: Theme): IParse
 }
 
 /**
- * Takes in a padding in a CSS-style format (e.g. 10, "10px", "10px 10px", etc.)
- *  where the separate padding values can also be the key of a themed spacing value
- *  (e.g. "s1 m", "10px l1 20px l2", etc.).
- * Returns a CSS-style padding.
+ * Takes in a padding in a CSS-style format (e.g. 10, "10px"), or a key of a themed spacing value
+ *  (e.g. "s1")
  */
-export function parsePadding(padding: number | string | undefined, theme: Theme): number | string | undefined {
-  if (padding === undefined || typeof padding === 'number' || padding === '') {
-    return padding;
-  }
-
-  const paddingValues = padding.split(' ');
-  if (paddingValues.length < 2) {
-    return _getThemedSpacing(padding, theme);
+export function parsePadding(padding: keyof Spacing | number | `${number}px` | undefined, theme: Theme): number | undefined {
+  if (padding === undefined || typeof padding === 'number') {
+    return padding as undefined | number;
   }
 
-  return paddingValues.reduce((padding1: string, padding2: string) => {
-    return _getThemedSpacing(padding1, theme) + ' ' + _getThemedSpacing(padding2, theme);
-  });
+  return _getThemedSpacing(padding, theme);
 }