UEA-PRODEM

node_modules/tailwind-merge/src/lib/validators.ts

@@ -1,6 +1,6 @@
 const arbitraryValueRegex = /^\[(?:(\w[\w-]*):)?(.+)\]$/i
 const arbitraryVariableRegex = /^\((?:(\w[\w-]*):)?(.+)\)$/i
-const fractionRegex = /^\d+\/\d+$/
+const fractionRegex = /^\d+(?:\.\d+)?\/\d+(?:\.\d+)?$/
 const tshirtUnitRegex = /^(\d+(\.\d+)?)?(xs|sm|md|lg|xl)$/
 const lengthUnitRegex =
     /\d+(%|px|r?em|[sdl]?v([hwib]|min|max)|pt|pc|in|cm|mm|cap|ch|ex|r?lh|cq(w|h|i|b|min|max))|\b(calc|min|max|clamp)\(.+\)|^0$/
@@ -37,6 +37,12 @@ const isImage = (value: string) => imageRegex.test(value)
 export const isAnyNonArbitrary = (value: string) =>
     !isArbitraryValue(value) && !isArbitraryVariable(value)
 
+export const isNamedContainerQuery = (value: string) =>
+    value.startsWith('@container') &&
+    ((value[10] === '/' && value[11] !== undefined) ||
+        (value[11] === 's' && value[16] !== undefined && value.startsWith('-size/', 10)) ||
+        (value[11] === 'n' && value[18] !== undefined && value.startsWith('-normal/', 10)))
+
 export const isArbitrarySize = (value: string) => getIsArbitraryValue(value, isLabelSize, isNever)
 
 export const isArbitraryValue = (value: string) => arbitraryValueRegex.test(value)
@@ -47,6 +53,11 @@ export const isArbitraryLength = (value: string) =>
 export const isArbitraryNumber = (value: string) =>
     getIsArbitraryValue(value, isLabelNumber, isNumber)
 
+export const isArbitraryWeight = (value: string) => getIsArbitraryValue(value, isLabelWeight, isAny)
+
+export const isArbitraryFamilyName = (value: string) =>
+    getIsArbitraryValue(value, isLabelFamilyName, isNever)
+
 export const isArbitraryPosition = (value: string) =>
     getIsArbitraryValue(value, isLabelPosition, isNever)
 
@@ -74,6 +85,9 @@ export const isArbitraryVariableImage = (value: string) =>
 export const isArbitraryVariableShadow = (value: string) =>
     getIsArbitraryVariable(value, isLabelShadow, true)
 
+export const isArbitraryVariableWeight = (value: string) =>
+    getIsArbitraryVariable(value, isLabelWeight, true)
+
 // Helpers
 
 const getIsArbitraryValue = (
@@ -125,4 +139,6 @@ const isLabelNumber = (label: string) => label === 'number'
 
 const isLabelFamilyName = (label: string) => label === 'family-name'
 
+const isLabelWeight = (label: string) => label === 'number' || label === 'weight'
+
 const isLabelShadow = (label: string) => label === 'shadow'