@d-matrix/utils 1.17.1 → 1.18.1

package/dist/echarts.js

@@ -68,7 +68,7 @@ export function fill(dataSource, xAxisField, yAxisField) {
  */
 export const getDiffRate = (first, maxDiff, decimalPlaces = 2, splitNumber = 5) => {
     let diffRate = 1.2;
-    if (first === 0)
+    if (first === 0 || maxDiff === 0)
         return diffRate;
     const minDiff = 1 / Math.pow(10, decimalPlaces);
     function calc(f, d) {

package/dist/react/index.d.ts

@@ -6,3 +6,4 @@ export * from './useCopyToClipboard';
 export * from './enhancedComponent';
 export * from './useDeepCompareRef';
 export * from './types';
+export * from './useForwardRef';

package/dist/react/index.js

@@ -6,3 +6,4 @@ export * from './useCopyToClipboard';
 export * from './enhancedComponent';
 export * from './useDeepCompareRef';
 export * from './types';
+export * from './useForwardRef';

package/dist/react/types.d.ts

@@ -1,2 +1,3 @@
-import type { ForwardRefExoticComponent } from 'react';
+import type { ForwardRefExoticComponent, NamedExoticComponent, ComponentPropsWithoutRef, ComponentPropsWithRef, RefAttributes, ElementType } from 'react';
+export declare type ComponentRef<T extends ElementType> = T extends NamedExoticComponent<ComponentPropsWithoutRef<T> & RefAttributes<infer Method>> ? Method : ComponentPropsWithRef<T> extends RefAttributes<infer Method> ? Method : never;
 export declare type InferRef<T> = T extends ForwardRefExoticComponent<infer Ref> ? Ref extends React.RefAttributes<infer RefElement> ? RefElement : never : never;

package/dist/react/useForwardRef.d.ts

@@ -0,0 +1,9 @@
+import { ForwardedRef } from 'react';
+/**
+ * https://stackoverflow.com/questions/66060217/i-cant-type-the-ref-correctly-using-useref-hook-in-typescript
+ * 解决 Property 'current' does not exist on type '(instance: HTMLInputElement | null) => void' TS类型错误
+ * @param ref
+ * @param initialValue
+ * @returns
+ */
+export declare const useForwardRef: <T>(ref: ForwardedRef<T>, initialValue?: any) => import("react").MutableRefObject<T>;

package/dist/react/useForwardRef.js

@@ -0,0 +1,22 @@
+import { useEffect, useRef } from 'react';
+/**
+ * https://stackoverflow.com/questions/66060217/i-cant-type-the-ref-correctly-using-useref-hook-in-typescript
+ * 解决 Property 'current' does not exist on type '(instance: HTMLInputElement | null) => void' TS类型错误
+ * @param ref
+ * @param initialValue
+ * @returns
+ */
+export const useForwardRef = (ref, initialValue = null) => {
+    const targetRef = useRef(initialValue);
+    useEffect(() => {
+        if (!ref)
+            return;
+        if (typeof ref === 'function') {
+            ref(targetRef.current);
+        }
+        else {
+            ref.current = targetRef.current;
+        }
+    }, [ref]);
+    return targetRef;
+};

package/dist/types.d.ts

@@ -13,3 +13,5 @@ export declare type FunctionPropertyNames<T> = {
 export declare type NonFunctionPropertyNames<T> = {
     [P in keyof T]-?: T[P] extends Function ? never : P;
 }[keyof T];
+/** 获取对象中key的值，返回由这些值组成的union type */
+export declare type ValueOf<T> = T[keyof T];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@d-matrix/utils",
   "sideEffects": false,
-  "version": "1.17.1",
+  "version": "1.18.1",
   "description": "A dozen of utils for Front-End Development",
   "main": "dist/index.js",
   "scripts": {

package/readme.md

@@ -99,7 +99,7 @@ const Test = () => {
 
 - `EnhancedComponent.prototype.setStateAsync(state)`
 
-setState 方法的同步版本
+`setState()`方法的同步版本
 
 ```ts
 import { react } from '@d-matrix/utils';
@@ -164,6 +164,20 @@ const Parent = () => {
 };
 ```
 
+- `useForwardRef = <T>(ref: ForwardedRef<T>, initialValue: any = null): React.MutableRefObject<T>`
+
+解决使用`React.forwardRef`后，在调用`ref.current.someMethod()`时, 出现`Property 'current' does not exist on type '(instance: HTMLInputElement | null) => void'` TS类型错误，具体问题见[这里](https://stackoverflow.com/questions/66060217/i-cant-type-the-ref-correctly-using-useref-hook-in-typescript)
+
+```ts
+const Input = React.forwardRef<HTMLInputElement, React.ComponentPropsWithRef<'input'>>((props, ref) => {
+  const forwardRef = useForwardRef<HTMLInputElement>(ref);
+  useEffect(() => {
+    forwardRef.current.focus();
+  });
+  return <input type="text" ref={forwardRef} value={props.value} />;
+});
+```
+
 ### dom
 
 - `scrollToTop(element: Element | null | undefined): void`
@@ -288,6 +302,24 @@ const t1 = {
 type T1 =  FunctionPropertyNames<typeof t1>; // 'result'
 ```
 
+- `ValueOf<T>`
+
+获取对象中`key`的值，返回由这些值组成的union type
+
+```ts
+const map = {
+  0: '0m',
+  1: '1m',
+  2: '2m',
+  3: '3m',
+  4: '4m',
+  5: '5m',
+  6: '6m',
+} as const;
+
+type T0 = ValueOf<typeof map>; // '0m' | '1m' | '2m' | '3m' | '4m' | '5m' | '6m'
+```
+
 ### algorithm
 
 - `moveMulti<T extends unknown>(arr: T[], indexes: number[], start: number): T[]`