🐛 fix: remove double check for defaults / respect unit settings

davidhellmann · Aug 18, 2022 · 39d5634 · 39d5634
1 parent 69ad700
commit 39d5634
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tailwindcss-fluid-type",
-  "version": "v2.0.0-alpha.2",
+  "version": "v2.0.0-alpha.3",
   "description": "Bring fluid type to tailwindcss",
   "main": "src/index.js",
   "license": "MIT",

diff --git a/src/utils/calcModularScale.js b/src/utils/calcModularScale.js
@@ -1,14 +1,14 @@
 const defaults = require("../config/defaults");
 
 module.exports = (value, data) => {
-    if (data.settingsAreNumbers && data.settings && defaults.settings) {
-        const sFtMin = data.settings?.fontSizeMin || defaults.settings?.fontSizeMin
-        const sFtMax = data.settings?.fontSizeMax || defaults.settings?.fontSizeMax
-        const sFtRMin = data.settings?.ratioMin || defaults.settings?.ratioMin
-        const sFtRMax = data.settings?.ratioMax || defaults.settings?.ratioMax
-        const sFtSMin = data.settings?.screenMin || defaults.settings?.screenMin
-        const sFtSMax = data.settings?.screenMax || defaults.settings?.screenMax
-        const unit = data.settings?.unit || defaults.settings?.unit
+    if (data.settingsAreNumbers && data.settings) {
+        const sFtMin = data.settings?.fontSizeMin
+        const sFtMax = data.settings?.fontSizeMax
+        const sFtRMin = data.settings?.ratioMin
+        const sFtRMax = data.settings?.ratioMax
+        const sFtSMin = data.settings?.screenMin
+        const sFtSMax = data.settings?.screenMax
+        const unit = data.unit
         const sFtUnit = typeof unit === 'string' ? unit : 'rem';
         const ftMin = sFtMin * Math.pow(sFtRMin, value);
         const ftMax = sFtMax * Math.pow(sFtRMax, value);

diff --git a/src/utils/createData.js b/src/utils/createData.js
@@ -12,6 +12,7 @@ module.exports = (options, data) => {
 
         // Add prefix
         data.prefix = options.settings?.prefix || defaults.settings?.prefix || ''
+        data.unit = options.settings?.unit || defaults.settings?.unit || 'rem'
 
         // Add number check
         data.settingsAreNumbers = Object