@hanzo/ui 4.4.0 → 4.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanzo/ui",
-  "version": "4.4.0",
+  "version": "4.4.1",
   "description": "Library that contains shared UI primitives, support for a common design system, and other boilerplate support.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package/primitives/input.tsx

@@ -15,7 +15,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
         className={cn(
           'flex h-10 w-full rounded-md border border-muted-3 bg-inherit px-3 py-2 text-sm ring-offset-background ' + 
           'file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-2 ' + 
-          'focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-1 ' + 
+          //'focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring focus-visible:ring-offset-1 ' + 
           'first-letter:disabled:cursor-not-allowed disabled:opacity-50',
           className
         )}

package/util/format-and-abbreviate-as-currency.ts

@@ -5,6 +5,17 @@ interface FormatThreshold {
   use: QuantityAbbrSymbol
 }
 
+const usdFormatter = Intl.NumberFormat('en-US', {
+  style: 'currency',
+  currency: 'USD',
+  minimumFractionDigits: 2,  
+})
+
+const formatAsUSCurrency = (n: number) => {
+  let result = usdFormatter.format(n)
+  return result.endsWith('.00') ? result.slice(0, -3) : result
+}
+
 const formatAndAbbreviateAsCurrency = (
   n: number | null,
   thresholds: FormatThreshold[] = [{
@@ -31,12 +42,7 @@ const formatAndAbbreviateAsCurrency = (
     }
   }
 
-  const usdFormatter = Intl.NumberFormat('en-US', {
-    style: 'currency',
-    currency: 'USD',
-    minimumFractionDigits: 0    
-  })
-  const formatted = usdFormatter.format(n)
+  const formatted = formatAsUSCurrency(n)
 
   if (n < thresholds[0].from) {
     return {
@@ -49,9 +55,9 @@ const formatAndAbbreviateAsCurrency = (
     // Get operative FormatThreshold pair...
   let threshold: FormatThreshold 
   for (
-    let i = 0, threshold = thresholds[0]; 
-    i < thresholds.length, n >= thresholds[i].from; 
-    i++
+    let i = 0; 
+    i < thresholds.length && n >= thresholds[i].from; 
+    threshold = thresholds[i], i++ 
   ) {}
 
     // Build up units array to all units
@@ -67,18 +73,18 @@ const formatAndAbbreviateAsCurrency = (
 
   const abbreviator = new Abbr(units)
 
-    // Use thresholdFrom as a guide to how many chars are available
+    // Use threshold.from as a guide to how many chars are available:
     // first digit + comma = 2
     // Possible trailing cents: '.xx'.length = 3
     // 3 - 2 = 1
-  const charsAvail = usdFormatter.format(threshold!.from).length + 1 
+  const charsAvail = formatAsUSCurrency(threshold!.from).length + 1 
   const abbr = abbreviator.abbreviate(n, charsAvail) // arbitrary, but good approx
   const numStr = abbr.slice(0, -1)
   const abbreviation = abbr.slice(-1)
   const numerical = parseFloat(numStr)
 
   const integral = Math.floor(numerical)
-  const integralString = usdFormatter.format(integral)
+  const integralString = formatAsUSCurrency(integral)
   const commas = integralString.split(',').length - 1
 
     // minus abbr, dec point, dollar sign, and roundingAdds / tilda,  
@@ -89,7 +95,7 @@ const formatAndAbbreviateAsCurrency = (
     // remove trailing zeros, if any
   const roundedNumerical = parseFloat(roundedString)
   const roundedIntegral = Math.trunc(roundedNumerical)
-  const roundedIntegralString = usdFormatter.format(roundedIntegral)
+  const roundedIntegralString = formatAsUSCurrency(roundedIntegral)
 
   let decimalPortion = roundedNumerical - roundedIntegral
   let result