feat: code review 问题修复

hellof2e · Jul 26, 2023 · eabf8c6 · eabf8c6
1 parent 9f4344f
commit eabf8c6
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 11 deletions.
diff --git a/packages/quark-react/src/index.ts b/packages/quark-react/src/index.ts
@@ -11,7 +11,7 @@ import CountDown from "./count-down";
 import Dialog from "./dialog";
 import Empty from "./empty";
 import Field, { FieldRef } from "./field";
-import Form, { FormRef } from "./form";
+import Form, { FormRef, FormProps, FormType, Rules } from "./form";
 import FormItem from "./form-item";
 import Grid from "./grid";
 import GridItem from "./grid-item";
@@ -45,7 +45,14 @@ import StepItem from "./step-item";
 import Sticky from "./sticky";
 import Swipe from "./swipe";
 import SwipeItem from "./swipe-item";
-import SwipeCell from "./swipe-cell";
+import SwipeCell, {
+  SwipeCellRef,
+  SwipeCellSide,
+  SwipeCellPosition,
+  SwipeCellProps,
+  SwipeCellType,
+  SwipeCellBeforeClose,
+} from "./swipe-cell";
 import Switch from "./switch";
 import Tabs from "./tabs";
 import TabContent from "./tab-content";
@@ -76,6 +83,9 @@ export {
   FieldRef,
   Form,
   FormRef,
+  FormProps,
+  FormType,
+  Rules,
   FormItem,
   Grid,
   GridItem,
@@ -114,6 +124,12 @@ export {
   Swipe,
   SwipeItem,
   SwipeCell,
+  SwipeCellRef,
+  SwipeCellSide,
+  SwipeCellPosition,
+  SwipeCellProps,
+  SwipeCellType,
+  SwipeCellBeforeClose,
   Switch,
   Tabs,
   TabContent,

diff --git a/packages/quark-react/src/swipe-cell/index.ts b/packages/quark-react/src/swipe-cell/index.ts
@@ -5,7 +5,7 @@ import {
   Props,
   SwipeCellSide,
   SwipeCellPosition,
-  BeforeCloseFunc,
+  BeforeCloseFunc as SwipeCellBeforeClose,
 } from "quarkd/lib/swipecell/type";
 import { componentBaseInterface, ReactifyProps } from "../type";
 
@@ -17,7 +17,7 @@ type SwipeCellType = FC<SwipeCellProps>;
 interface Ref {
   open(side: SwipeCellPosition): void;
   close(position: SwipeCellPosition): void;
-  setBeforeClose(fn: BeforeCloseFunc): void;
+  setBeforeClose(fn: SwipeCellBeforeClose): void;
 }
 
 type SwipeCellRef = Ref & HTMLElement;
@@ -28,7 +28,7 @@ export {
   SwipeCellRef,
   SwipeCellSide,
   SwipeCellPosition,
-  BeforeCloseFunc,
+  SwipeCellBeforeClose,
   SwipeCellProps,
   SwipeCellType,
 };
diff --git a/packages/quarkd/src/checkbox/style.css b/packages/quarkd/src/checkbox/style.css
@@ -1,5 +1,5 @@
 :host {
-  font-size: var(--checkbox-font-size, 14px);
+  font-size: var(--checkbox-font-size, 16px);
   color: var(--checkbox-color, #242729);
   display: inline-flex;
   justify-content: center;

diff --git a/packages/quarkd/src/form/form-item.tsx b/packages/quarkd/src/form/form-item.tsx
@@ -10,6 +10,7 @@ import AsyncValidator from "async-validator";
 import style from "./form-item.css";
 import { formTagNamesMap, getPropByPath, noop } from "./utils";
 import { debounce } from "../../utils/index";
+import { slotAssignedElements } from "../../utils/public";
 import { IFormProps, Rules } from "./type";
 
 @customElement({
@@ -176,7 +177,9 @@ class QuarkFormItem extends QuarkElement {
 
   defaultSlotChange = () => {
     if (!this.defaultSlotRef.current) return;
-    const slotNodes = this.defaultSlotRef.current.assignedNodes();
+    const slotNodes = slotAssignedElements(
+      this.defaultSlotRef.current?.assignedNodes()
+    );
     if (slotNodes.length > 0) {
       const formNode = slotNodes.find((node) => {
         return !!formTagNamesMap[node.tagName];

diff --git a/packages/quarkd/src/form/index.tsx b/packages/quarkd/src/form/index.tsx
@@ -10,6 +10,7 @@ import style from "./style.css";
 import QuarkFormItem from "./form-item";
 import { Rules, labelPosition } from "./type";
 import { getPropByPath } from "./utils";
+import { slotAssignedElements } from "../../utils/public";
 
 @customElement({
   tag: "quark-form",
@@ -47,9 +48,9 @@ class QuarkForm extends QuarkElement {
 
   onSlotChange = () => {
     if (this.slotRef.current) {
-      const allFormItes = this.slotRef.current
-        .assignedNodes()
-        .filter((item) => item.tagName === "QUARK-FORM-ITEM");
+      const allFormItes = slotAssignedElements(
+        this.slotRef.current.assignedNodes()
+      ).filter((item) => item.tagName === "QUARK-FORM-ITEM");
 
       this.formItems = allFormItes.filter((item) => item.prop);
 

diff --git a/packages/quarkd/src/radio/style.css b/packages/quarkd/src/radio/style.css
@@ -1,6 +1,6 @@
 :host([radiogrouphost]) {
   font-size: var(--radio-font-size, 16px);
-  color: var(--radio-color, #333);
+  color: var(--radio-color, #242729);
   display: block;
 }