@symbo.ls/scratch 2.11.228 → 2.11.229

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.
package/dist/cjs/index.js CHANGED
@@ -1422,6 +1422,7 @@ __export(src_exports, {
1422
1422
  hexToRgbArray: () => hexToRgbArray,
1423
1423
  hexToRgba: () => hexToRgba,
1424
1424
  hslToRgb: () => hslToRgb,
1425
+ isScalingUnit: () => isScalingUnit,
1425
1426
  mixTwoColors: () => mixTwoColors,
1426
1427
  mixTwoRgb: () => mixTwoRgb,
1427
1428
  mixTwoRgba: () => mixTwoRgba,
@@ -1495,6 +1496,7 @@ __export(utils_exports, {
1495
1496
  hexToRgbArray: () => hexToRgbArray,
1496
1497
  hexToRgba: () => hexToRgba,
1497
1498
  hslToRgb: () => hslToRgb,
1499
+ isScalingUnit: () => isScalingUnit,
1498
1500
  mixTwoColors: () => mixTwoColors,
1499
1501
  mixTwoRgb: () => mixTwoRgb,
1500
1502
  mixTwoRgba: () => mixTwoRgba,
@@ -1512,6 +1514,11 @@ __export(utils_exports, {
1512
1514
  setVariables: () => setVariables
1513
1515
  });
1514
1516
 
1517
+ // src/utils/unit.js
1518
+ var isScalingUnit = (unit) => {
1519
+ return unit === "em" || unit === "rem" || unit === "vw" || unit === "vh" || unit === "vmax" || unit === "vmin";
1520
+ };
1521
+
1515
1522
  // src/utils/color.js
1516
1523
  var import_globals = __toESM(require_cjs(), 1);
1517
1524
  var import_utils = __toESM(require_cjs2(), 1);
@@ -2026,9 +2033,10 @@ var setSequenceValue = (props, sequenceProps) => {
2026
2033
  sequenceProps.vars[variable] = scaling + sequenceProps.unit;
2027
2034
  };
2028
2035
  var setScalingVar = (key, sequenceProps) => {
2029
- const { type } = sequenceProps;
2036
+ const { base, type, unit } = sequenceProps;
2037
+ const defaultVal = (isScalingUnit(unit) ? 1 : base) + unit;
2030
2038
  if (key === 0)
2031
- return "1em";
2039
+ return defaultVal;
2032
2040
  const prefix = "--" + (type && type.replace(".", "-"));
2033
2041
  const ratioVar = `${prefix}-ratio`;
2034
2042
  if (key > 0) {
@@ -2238,7 +2246,7 @@ var applySequenceVars = (FACTORY2, options = {}) => {
2238
2246
  };
2239
2247
  var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
2240
2248
  const CONFIG2 = getActiveConfig();
2241
- const { UNIT: UNIT2, MEDIA: MEDIA2, TIMING: TIMING2, CSS_VARS: CSS_VARS2 } = CONFIG2;
2249
+ const { UNIT: UNIT2, MEDIA: MEDIA2, CSS_VARS: CSS_VARS2 } = CONFIG2;
2242
2250
  const mediaName = media.slice(1);
2243
2251
  const unit = FACTORY2.unit || UNIT2.default;
2244
2252
  const { mediaRegenerate } = FACTORY2;
@@ -2255,7 +2263,7 @@ var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
2255
2263
  }
2256
2264
  for (const key in sequence) {
2257
2265
  const item = sequence[key];
2258
- const value = (FACTORY2.type === TIMING2.type ? sequence[key].val : scales[key]) + unit;
2266
+ const value = (isScalingUnit(unit) ? scales[key] : sequence[key].val) + unit;
2259
2267
  if (!query && CONFIG2.verbose)
2260
2268
  console.warn("Can't find query ", query);
2261
2269
  let underMediaQuery = CSS_VARS2[`@media ${query}`];
@@ -2264,7 +2272,6 @@ var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
2264
2272
  underMediaQuery[item.variable] = `var(${item.variable + "_" + mediaName})`;
2265
2273
  CSS_VARS2[item.variable + "_" + mediaName] = value;
2266
2274
  }
2267
- console.log(CSS_VARS2);
2268
2275
  };
2269
2276
 
2270
2277
  // src/utils/sprite.js
package/dist/cjs/set.js CHANGED
@@ -1593,6 +1593,11 @@ var setActiveConfig = (newConfig) => {
1593
1593
  // src/system/color.js
1594
1594
  var import_utils9 = __toESM(require_cjs(), 1);
1595
1595
 
1596
+ // src/utils/unit.js
1597
+ var isScalingUnit = (unit) => {
1598
+ return unit === "em" || unit === "rem" || unit === "vw" || unit === "vh" || unit === "vmax" || unit === "vmin";
1599
+ };
1600
+
1596
1601
  // src/utils/color.js
1597
1602
  var import_globals = __toESM(require_cjs2(), 1);
1598
1603
  var import_utils2 = __toESM(require_cjs(), 1);
@@ -1781,9 +1786,10 @@ var setSequenceValue = (props, sequenceProps) => {
1781
1786
  sequenceProps.vars[variable] = scaling + sequenceProps.unit;
1782
1787
  };
1783
1788
  var setScalingVar = (key, sequenceProps) => {
1784
- const { type } = sequenceProps;
1789
+ const { base, type, unit } = sequenceProps;
1790
+ const defaultVal = (isScalingUnit(unit) ? 1 : base) + unit;
1785
1791
  if (key === 0)
1786
- return "1em";
1792
+ return defaultVal;
1787
1793
  const prefix = "--" + (type && type.replace(".", "-"));
1788
1794
  const ratioVar = `${prefix}-ratio`;
1789
1795
  if (key > 0) {
@@ -1985,7 +1991,7 @@ var applySequenceVars = (FACTORY2, options = {}) => {
1985
1991
  };
1986
1992
  var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
1987
1993
  const CONFIG2 = getActiveConfig();
1988
- const { UNIT: UNIT2, MEDIA: MEDIA2, TIMING: TIMING2, CSS_VARS: CSS_VARS2 } = CONFIG2;
1994
+ const { UNIT: UNIT2, MEDIA: MEDIA2, CSS_VARS: CSS_VARS2 } = CONFIG2;
1989
1995
  const mediaName = media.slice(1);
1990
1996
  const unit = FACTORY2.unit || UNIT2.default;
1991
1997
  const { mediaRegenerate } = FACTORY2;
@@ -2002,7 +2008,7 @@ var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
2002
2008
  }
2003
2009
  for (const key in sequence) {
2004
2010
  const item = sequence[key];
2005
- const value = (FACTORY2.type === TIMING2.type ? sequence[key].val : scales[key]) + unit;
2011
+ const value = (isScalingUnit(unit) ? scales[key] : sequence[key].val) + unit;
2006
2012
  if (!query && CONFIG2.verbose)
2007
2013
  console.warn("Can't find query ", query);
2008
2014
  let underMediaQuery = CSS_VARS2[`@media ${query}`];
@@ -2011,7 +2017,6 @@ var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
2011
2017
  underMediaQuery[item.variable] = `var(${item.variable + "_" + mediaName})`;
2012
2018
  CSS_VARS2[item.variable + "_" + mediaName] = value;
2013
2019
  }
2014
- console.log(CSS_VARS2);
2015
2020
  };
2016
2021
 
2017
2022
  // src/utils/sprite.js
@@ -1611,6 +1611,11 @@ var getActiveConfig = (def) => {
1611
1611
  return FACTORY[def || FACTORY.active];
1612
1612
  };
1613
1613
 
1614
+ // src/utils/unit.js
1615
+ var isScalingUnit = (unit) => {
1616
+ return unit === "em" || unit === "rem" || unit === "vw" || unit === "vh" || unit === "vmax" || unit === "vmin";
1617
+ };
1618
+
1614
1619
  // src/utils/color.js
1615
1620
  var import_globals = __toESM(require_cjs2(), 1);
1616
1621
  var import_utils2 = __toESM(require_cjs(), 1);
@@ -1804,9 +1809,10 @@ var setSequenceValue = (props, sequenceProps) => {
1804
1809
  sequenceProps.vars[variable] = scaling + sequenceProps.unit;
1805
1810
  };
1806
1811
  var setScalingVar = (key, sequenceProps) => {
1807
- const { type } = sequenceProps;
1812
+ const { base, type, unit } = sequenceProps;
1813
+ const defaultVal = (isScalingUnit(unit) ? 1 : base) + unit;
1808
1814
  if (key === 0)
1809
- return "1em";
1815
+ return defaultVal;
1810
1816
  const prefix = "--" + (type && type.replace(".", "-"));
1811
1817
  const ratioVar = `${prefix}-ratio`;
1812
1818
  if (key > 0) {
@@ -2008,7 +2014,7 @@ var applySequenceVars = (FACTORY2, options = {}) => {
2008
2014
  };
2009
2015
  var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
2010
2016
  const CONFIG2 = getActiveConfig();
2011
- const { UNIT: UNIT2, MEDIA: MEDIA2, TIMING: TIMING2, CSS_VARS: CSS_VARS2 } = CONFIG2;
2017
+ const { UNIT: UNIT2, MEDIA: MEDIA2, CSS_VARS: CSS_VARS2 } = CONFIG2;
2012
2018
  const mediaName = media.slice(1);
2013
2019
  const unit = FACTORY2.unit || UNIT2.default;
2014
2020
  const { mediaRegenerate } = FACTORY2;
@@ -2025,7 +2031,7 @@ var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
2025
2031
  }
2026
2032
  for (const key in sequence) {
2027
2033
  const item = sequence[key];
2028
- const value = (FACTORY2.type === TIMING2.type ? sequence[key].val : scales[key]) + unit;
2034
+ const value = (isScalingUnit(unit) ? scales[key] : sequence[key].val) + unit;
2029
2035
  if (!query && CONFIG2.verbose)
2030
2036
  console.warn("Can't find query ", query);
2031
2037
  let underMediaQuery = CSS_VARS2[`@media ${query}`];
@@ -2034,7 +2040,6 @@ var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
2034
2040
  underMediaQuery[item.variable] = `var(${item.variable + "_" + mediaName})`;
2035
2041
  CSS_VARS2[item.variable + "_" + mediaName] = value;
2036
2042
  }
2037
- console.log(CSS_VARS2);
2038
2043
  };
2039
2044
 
2040
2045
  // src/utils/sprite.js
@@ -1584,6 +1584,11 @@ var getActiveConfig = (def) => {
1584
1584
  // src/system/color.js
1585
1585
  var import_utils9 = __toESM(require_cjs(), 1);
1586
1586
 
1587
+ // src/utils/unit.js
1588
+ var isScalingUnit = (unit) => {
1589
+ return unit === "em" || unit === "rem" || unit === "vw" || unit === "vh" || unit === "vmax" || unit === "vmin";
1590
+ };
1591
+
1587
1592
  // src/utils/color.js
1588
1593
  var import_globals = __toESM(require_cjs2(), 1);
1589
1594
  var import_utils2 = __toESM(require_cjs(), 1);
@@ -1746,9 +1751,10 @@ var setSequenceValue = (props, sequenceProps) => {
1746
1751
  sequenceProps.vars[variable] = scaling + sequenceProps.unit;
1747
1752
  };
1748
1753
  var setScalingVar = (key, sequenceProps) => {
1749
- const { type } = sequenceProps;
1754
+ const { base, type, unit } = sequenceProps;
1755
+ const defaultVal = (isScalingUnit(unit) ? 1 : base) + unit;
1750
1756
  if (key === 0)
1751
- return "1em";
1757
+ return defaultVal;
1752
1758
  const prefix = "--" + (type && type.replace(".", "-"));
1753
1759
  const ratioVar = `${prefix}-ratio`;
1754
1760
  if (key > 0) {
@@ -1602,6 +1602,11 @@ var getActiveConfig = (def) => {
1602
1602
  return FACTORY[def || FACTORY.active];
1603
1603
  };
1604
1604
 
1605
+ // src/utils/unit.js
1606
+ var isScalingUnit = (unit) => {
1607
+ return unit === "em" || unit === "rem" || unit === "vw" || unit === "vh" || unit === "vmax" || unit === "vmin";
1608
+ };
1609
+
1605
1610
  // src/utils/color.js
1606
1611
  var import_globals = __toESM(require_cjs2(), 1);
1607
1612
  var import_utils4 = __toESM(require_cjs(), 1);
@@ -1651,9 +1656,10 @@ var setSequenceValue = (props, sequenceProps) => {
1651
1656
  sequenceProps.vars[variable] = scaling + sequenceProps.unit;
1652
1657
  };
1653
1658
  var setScalingVar = (key, sequenceProps) => {
1654
- const { type } = sequenceProps;
1659
+ const { base, type, unit } = sequenceProps;
1660
+ const defaultVal = (isScalingUnit(unit) ? 1 : base) + unit;
1655
1661
  if (key === 0)
1656
- return "1em";
1662
+ return defaultVal;
1657
1663
  const prefix = "--" + (type && type.replace(".", "-"));
1658
1664
  const ratioVar = `${prefix}-ratio`;
1659
1665
  if (key > 0) {
@@ -1847,7 +1853,7 @@ var applySequenceVars = (FACTORY2, options = {}) => {
1847
1853
  };
1848
1854
  var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
1849
1855
  const CONFIG2 = getActiveConfig();
1850
- const { UNIT: UNIT2, MEDIA: MEDIA2, TIMING: TIMING2, CSS_VARS: CSS_VARS2 } = CONFIG2;
1856
+ const { UNIT: UNIT2, MEDIA: MEDIA2, CSS_VARS: CSS_VARS2 } = CONFIG2;
1851
1857
  const mediaName = media.slice(1);
1852
1858
  const unit = FACTORY2.unit || UNIT2.default;
1853
1859
  const { mediaRegenerate } = FACTORY2;
@@ -1864,7 +1870,7 @@ var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
1864
1870
  }
1865
1871
  for (const key in sequence) {
1866
1872
  const item = sequence[key];
1867
- const value = (FACTORY2.type === TIMING2.type ? sequence[key].val : scales[key]) + unit;
1873
+ const value = (isScalingUnit(unit) ? scales[key] : sequence[key].val) + unit;
1868
1874
  if (!query && CONFIG2.verbose)
1869
1875
  console.warn("Can't find query ", query);
1870
1876
  let underMediaQuery = CSS_VARS2[`@media ${query}`];
@@ -1873,7 +1879,6 @@ var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
1873
1879
  underMediaQuery[item.variable] = `var(${item.variable + "_" + mediaName})`;
1874
1880
  CSS_VARS2[item.variable + "_" + mediaName] = value;
1875
1881
  }
1876
- console.log(CSS_VARS2);
1877
1882
  };
1878
1883
 
1879
1884
  // src/utils/sprite.js
@@ -1596,6 +1596,11 @@ var getActiveConfig = (def) => {
1596
1596
  return FACTORY[def || FACTORY.active];
1597
1597
  };
1598
1598
 
1599
+ // src/utils/unit.js
1600
+ var isScalingUnit = (unit) => {
1601
+ return unit === "em" || unit === "rem" || unit === "vw" || unit === "vh" || unit === "vmax" || unit === "vmin";
1602
+ };
1603
+
1599
1604
  // src/utils/color.js
1600
1605
  var import_globals = __toESM(require_cjs2(), 1);
1601
1606
  var import_utils4 = __toESM(require_cjs(), 1);
@@ -1645,9 +1650,10 @@ var setSequenceValue = (props, sequenceProps) => {
1645
1650
  sequenceProps.vars[variable] = scaling + sequenceProps.unit;
1646
1651
  };
1647
1652
  var setScalingVar = (key, sequenceProps) => {
1648
- const { type } = sequenceProps;
1653
+ const { base, type, unit } = sequenceProps;
1654
+ const defaultVal = (isScalingUnit(unit) ? 1 : base) + unit;
1649
1655
  if (key === 0)
1650
- return "1em";
1656
+ return defaultVal;
1651
1657
  const prefix = "--" + (type && type.replace(".", "-"));
1652
1658
  const ratioVar = `${prefix}-ratio`;
1653
1659
  if (key > 0) {
@@ -1584,6 +1584,11 @@ var getActiveConfig = (def) => {
1584
1584
  return FACTORY[def || FACTORY.active];
1585
1585
  };
1586
1586
 
1587
+ // src/utils/unit.js
1588
+ var isScalingUnit = (unit) => {
1589
+ return unit === "em" || unit === "rem" || unit === "vw" || unit === "vh" || unit === "vmax" || unit === "vmin";
1590
+ };
1591
+
1587
1592
  // src/utils/color.js
1588
1593
  var import_globals = __toESM(require_cjs2(), 1);
1589
1594
  var import_utils2 = __toESM(require_cjs(), 1);
@@ -1644,9 +1649,10 @@ var setSequenceValue = (props, sequenceProps) => {
1644
1649
  sequenceProps.vars[variable] = scaling + sequenceProps.unit;
1645
1650
  };
1646
1651
  var setScalingVar = (key, sequenceProps) => {
1647
- const { type } = sequenceProps;
1652
+ const { base, type, unit } = sequenceProps;
1653
+ const defaultVal = (isScalingUnit(unit) ? 1 : base) + unit;
1648
1654
  if (key === 0)
1649
- return "1em";
1655
+ return defaultVal;
1650
1656
  const prefix = "--" + (type && type.replace(".", "-"));
1651
1657
  const ratioVar = `${prefix}-ratio`;
1652
1658
  if (key > 0) {
@@ -1848,7 +1854,7 @@ var applySequenceVars = (FACTORY2, options = {}) => {
1848
1854
  };
1849
1855
  var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
1850
1856
  const CONFIG2 = getActiveConfig();
1851
- const { UNIT: UNIT2, MEDIA: MEDIA2, TIMING: TIMING2, CSS_VARS: CSS_VARS2 } = CONFIG2;
1857
+ const { UNIT: UNIT2, MEDIA: MEDIA2, CSS_VARS: CSS_VARS2 } = CONFIG2;
1852
1858
  const mediaName = media.slice(1);
1853
1859
  const unit = FACTORY2.unit || UNIT2.default;
1854
1860
  const { mediaRegenerate } = FACTORY2;
@@ -1865,7 +1871,7 @@ var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
1865
1871
  }
1866
1872
  for (const key in sequence) {
1867
1873
  const item = sequence[key];
1868
- const value = (FACTORY2.type === TIMING2.type ? sequence[key].val : scales[key]) + unit;
1874
+ const value = (isScalingUnit(unit) ? scales[key] : sequence[key].val) + unit;
1869
1875
  if (!query && CONFIG2.verbose)
1870
1876
  console.warn("Can't find query ", query);
1871
1877
  let underMediaQuery = CSS_VARS2[`@media ${query}`];
@@ -1874,7 +1880,6 @@ var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
1874
1880
  underMediaQuery[item.variable] = `var(${item.variable + "_" + mediaName})`;
1875
1881
  CSS_VARS2[item.variable + "_" + mediaName] = value;
1876
1882
  }
1877
- console.log(CSS_VARS2);
1878
1883
  };
1879
1884
 
1880
1885
  // src/utils/sprite.js
@@ -1592,6 +1592,11 @@ var getActiveConfig = (def) => {
1592
1592
  // src/system/color.js
1593
1593
  var import_utils9 = __toESM(require_cjs(), 1);
1594
1594
 
1595
+ // src/utils/unit.js
1596
+ var isScalingUnit = (unit) => {
1597
+ return unit === "em" || unit === "rem" || unit === "vw" || unit === "vh" || unit === "vmax" || unit === "vmin";
1598
+ };
1599
+
1595
1600
  // src/utils/color.js
1596
1601
  var import_globals = __toESM(require_cjs2(), 1);
1597
1602
  var import_utils2 = __toESM(require_cjs(), 1);
@@ -1759,9 +1764,10 @@ var setSequenceValue = (props, sequenceProps) => {
1759
1764
  sequenceProps.vars[variable] = scaling + sequenceProps.unit;
1760
1765
  };
1761
1766
  var setScalingVar = (key, sequenceProps) => {
1762
- const { type } = sequenceProps;
1767
+ const { base, type, unit } = sequenceProps;
1768
+ const defaultVal = (isScalingUnit(unit) ? 1 : base) + unit;
1763
1769
  if (key === 0)
1764
- return "1em";
1770
+ return defaultVal;
1765
1771
  const prefix = "--" + (type && type.replace(".", "-"));
1766
1772
  const ratioVar = `${prefix}-ratio`;
1767
1773
  if (key > 0) {
@@ -1373,6 +1373,7 @@ __export(utils_exports, {
1373
1373
  hexToRgbArray: () => hexToRgbArray,
1374
1374
  hexToRgba: () => hexToRgba,
1375
1375
  hslToRgb: () => hslToRgb,
1376
+ isScalingUnit: () => isScalingUnit,
1376
1377
  mixTwoColors: () => mixTwoColors,
1377
1378
  mixTwoRgb: () => mixTwoRgb,
1378
1379
  mixTwoRgba: () => mixTwoRgba,
@@ -1391,6 +1392,11 @@ __export(utils_exports, {
1391
1392
  });
1392
1393
  module.exports = __toCommonJS(utils_exports);
1393
1394
 
1395
+ // src/utils/unit.js
1396
+ var isScalingUnit = (unit) => {
1397
+ return unit === "em" || unit === "rem" || unit === "vw" || unit === "vh" || unit === "vmax" || unit === "vmin";
1398
+ };
1399
+
1394
1400
  // src/utils/color.js
1395
1401
  var import_globals = __toESM(require_cjs(), 1);
1396
1402
  var import_utils = __toESM(require_cjs2(), 1);
@@ -1879,9 +1885,10 @@ var setSequenceValue = (props, sequenceProps) => {
1879
1885
  sequenceProps.vars[variable] = scaling + sequenceProps.unit;
1880
1886
  };
1881
1887
  var setScalingVar = (key, sequenceProps) => {
1882
- const { type } = sequenceProps;
1888
+ const { base, type, unit } = sequenceProps;
1889
+ const defaultVal = (isScalingUnit(unit) ? 1 : base) + unit;
1883
1890
  if (key === 0)
1884
- return "1em";
1891
+ return defaultVal;
1885
1892
  const prefix = "--" + (type && type.replace(".", "-"));
1886
1893
  const ratioVar = `${prefix}-ratio`;
1887
1894
  if (key > 0) {
@@ -2091,7 +2098,7 @@ var applySequenceVars = (FACTORY2, options = {}) => {
2091
2098
  };
2092
2099
  var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
2093
2100
  const CONFIG2 = getActiveConfig();
2094
- const { UNIT: UNIT2, MEDIA: MEDIA2, TIMING: TIMING2, CSS_VARS: CSS_VARS2 } = CONFIG2;
2101
+ const { UNIT: UNIT2, MEDIA: MEDIA2, CSS_VARS: CSS_VARS2 } = CONFIG2;
2095
2102
  const mediaName = media.slice(1);
2096
2103
  const unit = FACTORY2.unit || UNIT2.default;
2097
2104
  const { mediaRegenerate } = FACTORY2;
@@ -2108,7 +2115,7 @@ var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
2108
2115
  }
2109
2116
  for (const key in sequence) {
2110
2117
  const item = sequence[key];
2111
- const value = (FACTORY2.type === TIMING2.type ? sequence[key].val : scales[key]) + unit;
2118
+ const value = (isScalingUnit(unit) ? scales[key] : sequence[key].val) + unit;
2112
2119
  if (!query && CONFIG2.verbose)
2113
2120
  console.warn("Can't find query ", query);
2114
2121
  let underMediaQuery = CSS_VARS2[`@media ${query}`];
@@ -2117,7 +2124,6 @@ var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
2117
2124
  underMediaQuery[item.variable] = `var(${item.variable + "_" + mediaName})`;
2118
2125
  CSS_VARS2[item.variable + "_" + mediaName] = value;
2119
2126
  }
2120
- console.log(CSS_VARS2);
2121
2127
  };
2122
2128
 
2123
2129
  // src/utils/sprite.js
@@ -1564,6 +1564,11 @@ var getActiveConfig = (def) => {
1564
1564
  return FACTORY[def || FACTORY.active];
1565
1565
  };
1566
1566
 
1567
+ // src/utils/unit.js
1568
+ var isScalingUnit = (unit) => {
1569
+ return unit === "em" || unit === "rem" || unit === "vw" || unit === "vh" || unit === "vmax" || unit === "vmin";
1570
+ };
1571
+
1567
1572
  // src/utils/sequence.js
1568
1573
  var numToLetterMap = {
1569
1574
  "-6": "U",
@@ -1608,9 +1613,10 @@ var setSequenceValue = (props, sequenceProps) => {
1608
1613
  sequenceProps.vars[variable] = scaling + sequenceProps.unit;
1609
1614
  };
1610
1615
  var setScalingVar = (key, sequenceProps) => {
1611
- const { type } = sequenceProps;
1616
+ const { base, type, unit } = sequenceProps;
1617
+ const defaultVal = (isScalingUnit(unit) ? 1 : base) + unit;
1612
1618
  if (key === 0)
1613
- return "1em";
1619
+ return defaultVal;
1614
1620
  const prefix = "--" + (type && type.replace(".", "-"));
1615
1621
  const ratioVar = `${prefix}-ratio`;
1616
1622
  if (key > 0) {
@@ -0,0 +1,28 @@
1
+ "use strict";
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __export = (target, all) => {
7
+ for (var name in all)
8
+ __defProp(target, name, { get: all[name], enumerable: true });
9
+ };
10
+ var __copyProps = (to, from, except, desc) => {
11
+ if (from && typeof from === "object" || typeof from === "function") {
12
+ for (let key of __getOwnPropNames(from))
13
+ if (!__hasOwnProp.call(to, key) && key !== except)
14
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
15
+ }
16
+ return to;
17
+ };
18
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
+
20
+ // src/utils/unit.js
21
+ var unit_exports = {};
22
+ __export(unit_exports, {
23
+ isScalingUnit: () => isScalingUnit
24
+ });
25
+ module.exports = __toCommonJS(unit_exports);
26
+ var isScalingUnit = (unit) => {
27
+ return unit === "em" || unit === "rem" || unit === "vw" || unit === "vh" || unit === "vmax" || unit === "vmin";
28
+ };
@@ -1557,6 +1557,11 @@ var import_utils3 = __toESM(require_cjs());
1557
1557
  // ../utils/src/scaling.js
1558
1558
  var import_utils2 = __toESM(require_cjs());
1559
1559
 
1560
+ // src/utils/unit.js
1561
+ var isScalingUnit = (unit) => {
1562
+ return unit === "em" || unit === "rem" || unit === "vw" || unit === "vh" || unit === "vmax" || unit === "vmin";
1563
+ };
1564
+
1560
1565
  // src/utils/sequence.js
1561
1566
  var getSubratioDifference = (base, ratio) => {
1562
1567
  const diff = base * ratio - base;
@@ -1620,7 +1625,7 @@ var applySequenceVars = (FACTORY2, options = {}) => {
1620
1625
  };
1621
1626
  var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
1622
1627
  const CONFIG2 = getActiveConfig();
1623
- const { UNIT: UNIT2, MEDIA: MEDIA2, TIMING: TIMING2, CSS_VARS: CSS_VARS2 } = CONFIG2;
1628
+ const { UNIT: UNIT2, MEDIA: MEDIA2, CSS_VARS: CSS_VARS2 } = CONFIG2;
1624
1629
  const mediaName = media.slice(1);
1625
1630
  const unit = FACTORY2.unit || UNIT2.default;
1626
1631
  const { mediaRegenerate } = FACTORY2;
@@ -1637,7 +1642,7 @@ var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
1637
1642
  }
1638
1643
  for (const key in sequence) {
1639
1644
  const item = sequence[key];
1640
- const value = (FACTORY2.type === TIMING2.type ? sequence[key].val : scales[key]) + unit;
1645
+ const value = (isScalingUnit(unit) ? scales[key] : sequence[key].val) + unit;
1641
1646
  if (!query && CONFIG2.verbose)
1642
1647
  console.warn("Can't find query ", query);
1643
1648
  let underMediaQuery = CSS_VARS2[`@media ${query}`];
@@ -1646,5 +1651,4 @@ var applyMediaSequenceVars = (FACTORY2, media, options = {}) => {
1646
1651
  underMediaQuery[item.variable] = `var(${item.variable + "_" + mediaName})`;
1647
1652
  CSS_VARS2[item.variable + "_" + mediaName] = value;
1648
1653
  }
1649
- console.log(CSS_VARS2);
1650
1654
  };
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@symbo.ls/scratch",
3
3
  "description": "Φ / CSS framework and methodology.",
4
4
  "author": "symbo.ls",
5
- "version": "2.11.228",
5
+ "version": "2.11.229",
6
6
  "files": [
7
7
  "src",
8
8
  "dist"
@@ -29,5 +29,5 @@
29
29
  "@symbo.ls/utils": "latest",
30
30
  "color-contrast-checker": "^1.5.0"
31
31
  },
32
- "gitHead": "56d2e29e73842899b56b329d61abf5f75e27cc7c"
32
+ "gitHead": "3ccc5fb6cb32e86462f774d7bac671a94e963e48"
33
33
  }
@@ -1,5 +1,6 @@
1
1
  'use strict'
2
2
 
3
+ export * from './unit.js'
3
4
  export * from './color.js'
4
5
  export * from './theme.js'
5
6
  export * from './font.js'
@@ -3,6 +3,7 @@
3
3
  import { isString } from '@domql/utils'
4
4
  import { toDashCase } from '@symbo.ls/utils'
5
5
  import { getActiveConfig } from '../factory.js'
6
+ import { isScalingUnit } from './unit.js'
6
7
 
7
8
  export const numToLetterMap = {
8
9
  '-6': 'U',
@@ -49,8 +50,11 @@ const setSequenceValue = (props, sequenceProps) => {
49
50
  }
50
51
 
51
52
  export const setScalingVar = (key, sequenceProps) => {
52
- const { type } = sequenceProps
53
- if (key === 0) return '1em'
53
+ const { base, type, unit } = sequenceProps
54
+
55
+ const defaultVal = (isScalingUnit(unit) ? 1 : base) + unit
56
+
57
+ if (key === 0) return defaultVal
54
58
 
55
59
  const prefix = '--' + (type && type.replace('.', '-'))
56
60
  const ratioVar = `${prefix}-ratio`
@@ -0,0 +1,5 @@
1
+ 'use strict'
2
+
3
+ export const isScalingUnit = unit => {
4
+ return unit === 'em' || unit === 'rem' || unit === 'vw' || unit === 'vh' || unit === 'vmax' || unit === 'vmin'
5
+ }
package/src/utils/var.js CHANGED
@@ -3,6 +3,7 @@
3
3
  import { isObjectLike } from '@domql/utils'
4
4
  import { getActiveConfig } from '../factory.js'
5
5
  import { getSubratio } from './sequence.js'
6
+ import { isScalingUnit } from './unit.js'
6
7
 
7
8
  export const setVariables = (result, key) => {
8
9
  const CONFIG = getActiveConfig()
@@ -68,7 +69,7 @@ export const applySequenceVars = (FACTORY, options = {}) => {
68
69
 
69
70
  export const applyMediaSequenceVars = (FACTORY, media, options = {}) => {
70
71
  const CONFIG = getActiveConfig()
71
- const { UNIT, MEDIA, TIMING, CSS_VARS } = CONFIG
72
+ const { UNIT, MEDIA, CSS_VARS } = CONFIG
72
73
 
73
74
  const mediaName = media.slice(1)
74
75
 
@@ -91,9 +92,9 @@ export const applyMediaSequenceVars = (FACTORY, media, options = {}) => {
91
92
  for (const key in sequence) {
92
93
  const item = sequence[key]
93
94
 
94
- const value = (FACTORY.type === TIMING.type
95
- ? sequence[key].val
96
- : scales[key]
95
+ const value = (isScalingUnit(unit)
96
+ ? scales[key]
97
+ : sequence[key].val
97
98
  ) + unit
98
99
 
99
100
  if (!query && CONFIG.verbose) console.warn('Can\'t find query ', query)
@@ -104,6 +105,4 @@ export const applyMediaSequenceVars = (FACTORY, media, options = {}) => {
104
105
  underMediaQuery[item.variable] = `var(${item.variable + '_' + mediaName})`
105
106
  CSS_VARS[item.variable + '_' + mediaName] = value
106
107
  }
107
-
108
- console.log(CSS_VARS)
109
108
  }