@hanzo/ui 4.3.6 → 4.3.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hanzo/ui",
-  "version": "4.3.6",
+  "version": "4.3.8",
   "description": "Library that contains shared UI primitives, support for a common design system, and other boilerplate support.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
@@ -14,7 +14,6 @@
     "url": "git+https://github.com/hanzoai/react-sdk.git",
     "directory": "pkg/ui"
   },
-  "types": "./declare.d.ts",
   "keywords": [
     "components",
     "ecommerce",
@@ -82,7 +81,6 @@
     "lodash.isplainobject": "^4.0.6",
     "lodash.merge": "^4.6.2",
     "markdown-to-jsx": "^7.4.7",
-    "number-abbreviate": "^2.0.0",
     "postcss-selector-parser": "^6.0.16",
     "react-day-picker": "^8.10.1",
     "react-intersection-observer": "^9.8.2",

package/primitives/form.tsx

@@ -1,4 +1,3 @@
-// @ts-nocheck
 'use client'
 import * as React from "react"
 import * as LabelPrimitive from "@radix-ui/react-label"
@@ -7,7 +6,7 @@ import { Slot } from "@radix-ui/react-slot"
 import {
   Controller,
   type ControllerProps,
-  FieldPath,
+  type FieldPath,
   type FieldValues,
   FormProvider,
   useFormContext,

package/tsconfig.json

@@ -6,10 +6,5 @@
   ],
   "exclude": [
     "node_modules",
-  ],
-  "compilerOptions": {
-    "typeRoots": [
-      "./declare.d.ts"
-    ]
-  }
+  ]
 }

package/util/format-to-max-char.ts

@@ -1,7 +1,22 @@
-import Abbr from 'number-abbreviate'
+import Abbr from './number-abbreviate'
 
 const abbr = new Abbr(['K', 'M', 'B', 'T'])
 
+const isPowerOf10 = (n: number) => {
+  if (n <= 0) {
+    return false
+  }
+
+  while (n > 1) {
+    if (n % 10 !== 0) {
+      return false
+    }
+    n /= 10
+  }
+
+  return true
+}
+
 const formatToMaxChar = (
   n: number | null, 
   maxChars: number, 
@@ -13,7 +28,7 @@ const formatToMaxChar = (
   roundingAdds: number = 1 
 ): {
   result: string 
-  change: 'rounded' | 'none' | 'empty' 
+  change: 'rounded' | 'none' | 'abbr' | 'empty' 
 } => {
   if (n === null) {
     return {
@@ -40,10 +55,12 @@ const formatToMaxChar = (
       }
     }
     else {
+
       const str = abbr.abbreviate(n, maxChars)
       const numStr = str.slice(0, -1)
       const abbreviation = str.slice(-1)
       const numerical = parseFloat(numStr)
+
         // minus abbr, dec point, and roundingAdds / tilda,  
         // (1 + 1 + roundingAdds)
         // ("precision" does NOT include the decimal point itself, 
@@ -53,7 +70,7 @@ const formatToMaxChar = (
       const roundedNumerical = parseFloat(roundedString)
       return {
         result: roundedNumerical.toString() + abbreviation,
-        change: 'rounded'
+        change: roundedNumerical === numerical ? 'abbr' : 'rounded'
       }
     }
   }

package/util/number-abbreviate.ts

@@ -0,0 +1,100 @@
+// cf: https://github.com/domharrington/js-number-abbreviate/blob/master/index.js
+
+const DEF_ABBREVIATIONS = ['K', 'M', 'B', 'T']
+
+class NumberAbbreviator {
+
+  private _units: string[]
+
+  constructor(units?: string[]) {
+    this._units = units ?? DEF_ABBREVIATIONS
+  }
+
+  private _abbreviate = (n: number, decPlaces: number): string  => {
+
+    const _decPlaces = Math.pow(10, decPlaces)
+    let _n = n
+
+    let _unit
+    for (let i = this._units.length - 1; i >= 0; i--) {
+      const size = Math.pow(10, (i + 1) * 3)
+      if (size <= _n) {
+        _n = Math.round(_n * _decPlaces / size) / _decPlaces
+        if ((_n === 1000) && (i < this._units.length - 1)) {
+          _n = 1
+          i++
+        }
+        _unit = this._units[i]
+        break
+      }
+    }
+    return _n.toString() + (_unit ?? '')
+  }
+
+  abbreviate = (n: number, decPlaces: number) => {
+    const abbreviatedNumber = this._abbreviate(Math.abs(n), decPlaces || 0)
+    return n < 0 ? '-' + abbreviatedNumber : abbreviatedNumber
+  }  
+}
+
+
+export default NumberAbbreviator
+
+/*
+(function(root){
+  'use strict';
+
+  function NumberAbbreviate() {
+    var units
+    if (!(this instanceof NumberAbbreviate)) {
+      // function usage: abbrev(n, decPlaces, units)
+      var n = arguments[0]
+      var decPlaces = arguments[1]
+      units = arguments[2]
+      var ab = new NumberAbbreviate(units)
+      return ab.abbreviate(n, decPlaces)
+    }
+    // class usage: new NumberAbbreviate(units)
+    units = arguments[0]
+    this.units = units == null ? ['k', 'm', 'b', 't'] : units
+  }
+
+  NumberAbbreviate.prototype._abbreviate = function(number, decPlaces) {
+    decPlaces = Math.pow(10, decPlaces)
+
+    for (var i = this.units.length - 1; i >= 0; i--) {
+
+      var size = Math.pow(10, (i + 1) * 3)
+
+      if (size <= number) {
+        number = Math.round(number * decPlaces / size) / decPlaces
+
+        if ((number === 1000) && (i < this.units.length - 1)) {
+          number = 1
+          i++
+        }
+
+        number += this.units[i]
+
+        break
+      }
+    }
+
+    return number
+  }
+
+  NumberAbbreviate.prototype.abbreviate = function(number, decPlaces) {
+    var isNegative = number < 0
+    var abbreviatedNumber = this._abbreviate(Math.abs(number), decPlaces || 0)
+
+    return isNegative ? '-' + abbreviatedNumber : abbreviatedNumber;
+  }
+
+  if (typeof module !== 'undefined' && module.exports) {
+    module.exports = NumberAbbreviate
+  } else {
+    root.NumberAbbreviate = NumberAbbreviate
+  }
+
+})(this);
+*/

package/declare.d.ts

@@ -1 +0,0 @@
-declare module 'number-abbreviate'