@retikz/core 0.0.1-rc.0 → 0.0.1-rc.2

package/dist/es/components/node/_hooks/useNodeConfig.d.ts

@@ -1,3 +1,3 @@
 import { NodeConfig } from '../../../model/component/node';
-declare const useNodeConfig: () => import('react').RefObject<NodeConfig>;
+declare const useNodeConfig: () => import('react').MutableRefObject<NodeConfig>;
 export default useNodeConfig;

package/dist/es/components/node/_hooks/useNodeContent.js

@@ -1,11 +1,11 @@
-import { j as jsxRuntimeExports } from "../../../_virtual/jsx-runtime.js";
+import { jsx } from "react/jsx-runtime";
 import { isValidElement, useMemo, cloneElement } from "react";
 import Text from "../../../elements/Text.js";
 const useNodeContent = (props, ref) => {
   const { color, size, opacity, fontWeight, fontStyle, fontFamily, fontStretch, children } = props;
   const isTextNode = children !== null && !isValidElement(children);
   return useMemo(
-    () => isTextNode ? /* @__PURE__ */ jsxRuntimeExports.jsx(
+    () => isTextNode ? /* @__PURE__ */ jsx(
       Text,
       {
         fill: color,
@@ -18,7 +18,10 @@ const useNodeContent = (props, ref) => {
         ref,
         children
       }
-    ) : isValidElement(children) ? cloneElement(children, { ref }) : children,
+    ) : isValidElement(children) ? (
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      cloneElement(children, { ref })
+    ) : children,
     isTextNode ? [color, size, children] : [children]
   );
 };

package/dist/es/components/node/_hooks/useNodeShape.js

@@ -1,4 +1,4 @@
-import { j as jsxRuntimeExports } from "../../../_virtual/jsx-runtime.js";
+import { jsx } from "react/jsx-runtime";
 import { useMemo } from "react";
 import Rect from "../../../elements/Rect.js";
 const getShapeProps = (nodeProps) => {
@@ -27,7 +27,7 @@ const useNodeShape = (props, ref) => {
         return Rect;
     }
   }, [props.shape, ...Object.values(shapeProps)]);
-  return /* @__PURE__ */ jsxRuntimeExports.jsx(Shape, { ref, ...shapeProps });
+  return /* @__PURE__ */ jsx(Shape, { ref, ...shapeProps });
 };
 export {
   useNodeShape as default

package/dist/es/components/{pathNode → path-node}/PathNode.d.ts

@@ -1,4 +1,3 @@
-import { FC } from 'react';
 import { Direction } from '../../types/coordinate';
 import { Position } from '../../types/coordinate/descartes';
 import { NodeProps } from '../node/Node';
@@ -35,5 +34,15 @@ export type PathNodeProps = {
     /** 跟随箭头位置 */
     sloped?: boolean;
 } & PathNodePositionProps & PosShortcutProps & Omit<NodeProps, 'position'>;
-declare const PathNode: FC<PathNodeProps>;
+declare const PathNode: import('react').ForwardRefExoticComponent<{
+    segmentIndex?: number;
+    /** path 片段的下标 */
+    pos?: number;
+    /** 相对于路径的位置 */
+    anchor?: Direction | "center";
+    /** 偏移位置 */
+    offset?: Position;
+    /** 跟随箭头位置 */
+    sloped?: boolean;
+} & PathNodePositionProps & PosShortcutProps & Omit<NodeProps, "position"> & import('react').RefAttributes<SVGGElement>>;
 export default PathNode;

package/dist/es/components/{pathNode → path-node}/PathNode.js

@@ -1,5 +1,5 @@
-import { j as jsxRuntimeExports } from "../../_virtual/jsx-runtime.js";
-import { useId, useMemo, useState, useLayoutEffect } from "react";
+import { jsx } from "react/jsx-runtime";
+import { forwardRef, useId, useMemo, useState, useLayoutEffect } from "react";
 import useCalculate from "../../hooks/context/useCalculate.js";
 import useNodes from "../../hooks/context/useNodes.js";
 import useScope, { ScopeContext } from "../../hooks/context/useScope.js";
@@ -8,8 +8,8 @@ import { convertCssToPx } from "../../utils/css.js";
 import { convertPrecision } from "../../utils/math.js";
 import Node from "../node/Node.js";
 import useAnchor from "./useAnchor.js";
-const PathNode = (props) => {
-  const { segmentIndex = -1, offset = [0, 0], anchor, ref, left, right, above, below, name, ...resProps } = props;
+const PathNode = forwardRef((props, ref) => {
+  const { segmentIndex = -1, offset = [0, 0], anchor, left, right, above, below, name, ...resProps } = props;
   const { pos, veryNearStart, veryNearEnd, start, nearStart, midway, nearEnd, end, sloped, ...nodeProps } = resProps;
   const id = useId();
   const realName = name ?? id;
@@ -60,7 +60,7 @@ const PathNode = (props) => {
     setAdjustOffset(DescartesPoint.plus(anchorPosition, directionPosition, offset));
   }, [anchorPosition, directionPos]);
   const scope = useScope();
-  return /* @__PURE__ */ jsxRuntimeExports.jsx(ScopeContext, { value: { ...scope, offset: [0, 0] }, children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+  return /* @__PURE__ */ jsx(ScopeContext.Provider, { value: { ...scope, offset: [0, 0] }, children: /* @__PURE__ */ jsx(
     Node,
     {
       name: realName,
@@ -70,7 +70,7 @@ const PathNode = (props) => {
       ...nodeProps
     }
   ) });
-};
+});
 export {
   PathNode as default
 };

package/dist/es/container/Group.d.ts

@@ -1,6 +1,6 @@
-import { FC, PropsWithChildren, Ref, SVGProps } from 'react';
+import { PropsWithChildren, Ref, SVGProps } from 'react';
 export type GroupProps = {
     ref?: Ref<SVGGElement>;
 } & SVGProps<SVGGElement>;
-declare const Group: FC<PropsWithChildren<GroupProps>>;
+declare const Group: import('react').ForwardRefExoticComponent<Omit<PropsWithChildren<SVGProps<SVGGElement>>, "ref"> & import('react').RefAttributes<SVGGElement>>;
 export default Group;

package/dist/es/container/Group.js

@@ -1,7 +1,8 @@
-import { j as jsxRuntimeExports } from "../_virtual/jsx-runtime.js";
-const Group = (props) => {
-  return /* @__PURE__ */ jsxRuntimeExports.jsx("g", { ...props });
-};
+import { jsx } from "react/jsx-runtime";
+import { forwardRef } from "react";
+const Group = forwardRef((props, ref) => {
+  return /* @__PURE__ */ jsx("g", { ref, ...props });
+});
 export {
   Group as default
 };

package/dist/es/container/Surface.d.ts

@@ -1,4 +1,4 @@
-import { CSSProperties, FC, PropsWithChildren } from 'react';
+import { CSSProperties } from 'react';
 export type SurfaceProps = {
     title?: string;
     desc?: string;
@@ -13,5 +13,7 @@ export type SurfaceProps = {
     className?: string;
     style?: CSSProperties;
 };
-declare const Surface: FC<PropsWithChildren<SurfaceProps>>;
+declare const Surface: import('react').ForwardRefExoticComponent<SurfaceProps & {
+    children?: import('react').ReactNode | undefined;
+} & import('react').RefAttributes<SVGSVGElement>>;
 export default Surface;

package/dist/es/container/Surface.js

@@ -1,6 +1,6 @@
-import { j as jsxRuntimeExports } from "../_virtual/jsx-runtime.js";
-import { useMemo } from "react";
-const Surface = (props) => {
+import { jsxs, jsx } from "react/jsx-runtime";
+import { forwardRef, useMemo } from "react";
+const Surface = forwardRef((props, ref) => {
   const { title, desc, viewBox, children, width, height, ...otherProps } = props;
   const svgViewBox = useMemo(() => {
     if (!(viewBox == null ? void 0 : viewBox.x) && !(viewBox == null ? void 0 : viewBox.y)) {
@@ -12,12 +12,12 @@ const Surface = (props) => {
     const viewHeight = (viewBox == null ? void 0 : viewBox.height) || height;
     return viewWidth === void 0 || viewHeight === void 0 ? [viewX, viewY].join(" ") : [viewX, viewY, viewWidth, viewHeight].join(" ");
   }, [width, height, viewBox]);
-  return /* @__PURE__ */ jsxRuntimeExports.jsxs("svg", { viewBox: svgViewBox, width, height, ...otherProps, children: [
-    title ? /* @__PURE__ */ jsxRuntimeExports.jsx("title", { children: title }) : null,
-    desc ? /* @__PURE__ */ jsxRuntimeExports.jsx("desc", { children: desc }) : null,
+  return /* @__PURE__ */ jsxs("svg", { ref, viewBox: svgViewBox, width, height, ...otherProps, children: [
+    title ? /* @__PURE__ */ jsx("title", { children: title }) : null,
+    desc ? /* @__PURE__ */ jsx("desc", { children: desc }) : null,
     children
   ] });
-};
+});
 export {
   Surface as default
 };

package/dist/es/elements/Path.d.ts

@@ -1,4 +1,4 @@
-import { FC, SVGProps } from 'react';
+import { SVGProps } from 'react';
 export type PathProps = {} & SVGProps<SVGPathElement>;
-declare const Path: FC<PathProps>;
+declare const Path: import('react').ForwardRefExoticComponent<Omit<SVGProps<SVGPathElement>, "ref"> & import('react').RefAttributes<SVGPathElement>>;
 export default Path;

package/dist/es/elements/Path.js

@@ -1,13 +1,14 @@
-import { j as jsxRuntimeExports } from "../_virtual/jsx-runtime.js";
-const Path = (props) => {
+import { jsx } from "react/jsx-runtime";
+import { forwardRef } from "react";
+const Path = forwardRef((props, ref) => {
   const { fill: propFill, strokeWidth: propStrokeWidth, stroke: propStroke, ...otherProps } = props;
   const defaultProps = {
     fill: propFill || "transparent",
     strokeWidth: propStrokeWidth ?? 1,
     stroke: propStroke || "currentColor"
   };
-  return /* @__PURE__ */ jsxRuntimeExports.jsx("path", { ...defaultProps, ...otherProps });
-};
+  return /* @__PURE__ */ jsx("path", { ref, ...defaultProps, ...otherProps });
+});
 export {
   Path as default
 };

package/dist/es/elements/Rect.d.ts

@@ -1,6 +1,4 @@
-import { FC, PropsWithChildren, Ref, SVGProps } from 'react';
-export type RectProps = {
-    ref?: Ref<SVGRectElement>;
-} & SVGProps<SVGRectElement>;
-declare const Rect: FC<PropsWithChildren<RectProps>>;
+import { PropsWithChildren, SVGProps } from 'react';
+export type RectProps = SVGProps<SVGRectElement>;
+declare const Rect: import('react').ForwardRefExoticComponent<Omit<PropsWithChildren<RectProps>, "ref"> & import('react').RefAttributes<SVGRectElement>>;
 export default Rect;

package/dist/es/elements/Rect.js

@@ -1,8 +1,9 @@
-import { j as jsxRuntimeExports } from "../_virtual/jsx-runtime.js";
-const Rect = (props) => {
-  const { ref, ...otherProps } = props;
-  return /* @__PURE__ */ jsxRuntimeExports.jsx("rect", { ref, ...otherProps });
-};
+import { jsx } from "react/jsx-runtime";
+import { forwardRef } from "react";
+const Rect = forwardRef((props, ref) => {
+  const { ...otherProps } = props;
+  return /* @__PURE__ */ jsx("rect", { ref, ...otherProps });
+});
 export {
   Rect as default
 };

package/dist/es/elements/Text.d.ts

@@ -1,4 +1,4 @@
-import { FC, PropsWithChildren, Ref, SVGProps } from 'react';
+import { PropsWithChildren, SVGProps } from 'react';
 import { FontProps } from '../types/svg/font';
 type TextVerticalAlign = 'top' | 'center' | 'bottom';
 export type DominantBaseline = 'auto' | 'text-bottom' | 'alphabetic' | 'ideographic' | 'middle' | 'central' | 'mathematical' | 'hanging' | 'text-top';
@@ -9,11 +9,10 @@ export type TextProps = {
     verticalAlign?: TextVerticalAlign | DominantBaseline;
     fontSize?: SVGProps<SVGTextElement>['fontSize'];
     fill?: SVGProps<SVGTextElement>['fill'];
-    ref?: Ref<SVGTextElement>;
 } & FontProps & SVGProps<SVGTextElement>;
 /**
  * 文本节点
  * @tikz node
  */
-declare const Text: FC<PropsWithChildren<TextProps>>;
+declare const Text: import('react').ForwardRefExoticComponent<Omit<PropsWithChildren<TextProps>, "ref"> & import('react').RefAttributes<SVGTextElement>>;
 export default Text;

package/dist/es/elements/Text.js

@@ -1,8 +1,8 @@
-import { j as jsxRuntimeExports } from "../_virtual/jsx-runtime.js";
-import { useMemo } from "react";
+import { jsx } from "react/jsx-runtime";
+import { forwardRef, useMemo } from "react";
 import { textWrapParse } from "../utils/string.js";
-const Text = (props) => {
-  const { children, ref, align, verticalAlign, fontSize, fill, ...otherProps } = props;
+const Text = forwardRef((props, ref) => {
+  const { children, align, verticalAlign, fontSize, fill, ...otherProps } = props;
   const dominantBaseline = useMemo(() => {
     switch (verticalAlign) {
       case "top":
@@ -24,12 +24,12 @@ const Text = (props) => {
   };
   const parseChildren = (children2) => {
     if (typeof children2 === "string") {
-      return textWrapParse(children2).map((child, index) => /* @__PURE__ */ jsxRuntimeExports.jsx("tspan", { children: child }, index));
+      return textWrapParse(children2).map((child, index) => /* @__PURE__ */ jsx("tspan", { children: child }, index));
     }
     return children2;
   };
-  return /* @__PURE__ */ jsxRuntimeExports.jsx("text", { ref, ...textProps, children: parseChildren(children) });
-};
+  return /* @__PURE__ */ jsx("text", { ref, ...textProps, children: parseChildren(children) });
+});
 export {
   Text as default
 };

package/dist/es/hooks/useForceUpdate.d.ts

@@ -1,2 +1,2 @@
-declare const useForceUpdate: () => import('react').ActionDispatch<[]>;
+declare const useForceUpdate: () => import('react').DispatchWithoutAction;
 export default useForceUpdate;

package/dist/es/index.d.ts

@@ -1,9 +1,9 @@
-export { default as Draw } from './components/draw/Draw';
-export type { DrawProps } from './components/draw/Draw';
+export { default as Draw } from './components/draw';
+export type { DrawProps } from './components/draw';
 export { default as Node } from './components/node';
 export type { NodeProps } from './components/node';
-export { default as PathNode } from './components/pathNode';
-export type { PathNodeProps } from './components/pathNode';
+export { default as PathNode } from './components/path-node';
+export type { PathNodeProps } from './components/path-node';
 export { default as Scope } from './components/Scope';
 export type { ScopeProps } from './components/Scope';
 export { default as TikZ } from './components/TikZ';

package/dist/es/index.js

@@ -1,6 +1,6 @@
 import { default as default2 } from "./components/draw/Draw.js";
 import { default as default3 } from "./components/node/Node.js";
-import { default as default4 } from "./components/pathNode/PathNode.js";
+import { default as default4 } from "./components/path-node/PathNode.js";
 import { default as default5 } from "./components/Scope.js";
 import { default as default6 } from "./components/TikZ.js";
 export {

package/dist/es/model/equation/line.js

@@ -8,6 +8,7 @@ const _Line = class _Line {
     __publicField(this, "b", 0);
     __publicField(this, "c", 0);
     if (a === 0 && b === 0) {
+      console.error("invalid line equation");
       return;
     }
     this.a = a;

package/dist/es/test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/es/types/svg/stroke.d.ts

@@ -1,10 +1,10 @@
 export type StrokeProps = {
     stroke?: string;
-    strokeWidth?: number;
+    strokeWidth?: number | string;
     strokeDasharray?: string;
     strokeDashoffset?: string;
     strokeLinecap?: 'butt' | 'round' | 'square' | 'inherit';
-    strokeLinejoin?: "round" | "inherit" | "bevel" | "miter";
+    strokeLinejoin?: 'round' | 'inherit' | 'bevel' | 'miter';
     strokeMiterlimit?: number;
     strokeOpacity?: number;
 };

package/dist/es/utils/style/stroke.d.ts

@@ -1,5 +1,6 @@
 import { StrokeProps } from '../../types/svg/stroke';
-export type StrokeType = 'solid' | 'dashed' | 'denselyDashed' | 'looselyDashed' | 'dotted' | 'denselyDotted' | 'looselyDotted' | 'dashDot' | 'denselyDashDot' | 'looselyDashDot' | 'dashDashDot' | 'denselyDashDashDot' | 'looselyDashDashDot';
+export declare const strokeTypes: readonly ["solid", "dashed", "denselyDashed", "looselyDashed", "dotted", "denselyDotted", "looselyDotted", "dashDot", "denselyDashDot", "looselyDashDot", "dashDashDot", "denselyDashDashDot", "looselyDashDashDot"];
+export type StrokeType = typeof strokeTypes[number];
 export type StrokeShortcutProps = {
     dashed?: boolean;
     denselyDashed?: boolean;
@@ -15,5 +16,5 @@ export type StrokeShortcutProps = {
     looselyDashDashDot?: boolean;
 };
 /** 将 StrokeType 转换为 svg 原生的属性 */
-export declare const convertStrokeType: (strokeType: StrokeType, strokeWidth?: number) => Partial<StrokeProps>;
-export declare const convertStrokeShortcut: (shortcutProps: StrokeShortcutProps, strokeWidth?: number) => Partial<StrokeProps>;
+export declare const convertStrokeType: (strokeType: StrokeType, oriStrokeWidth?: string | number) => Partial<StrokeProps>;
+export declare const convertStrokeShortcut: (shortcutProps: StrokeShortcutProps, oriStrokeWidth?: string | number) => Partial<StrokeProps>;

package/dist/es/utils/style/stroke.js

@@ -1,4 +1,5 @@
-const convertStrokeType = (strokeType, strokeWidth = 1) => {
+const convertStrokeType = (strokeType, oriStrokeWidth = 1) => {
+  const strokeWidth = Number(oriStrokeWidth);
   switch (strokeType) {
     case "solid":
       return {};
@@ -28,7 +29,8 @@ const convertStrokeType = (strokeType, strokeWidth = 1) => {
       return { strokeDasharray: `${strokeWidth * 4} ${strokeWidth * 6} 1 ${strokeWidth * 6} 1 ${strokeWidth * 6}` };
   }
 };
-const convertStrokeShortcut = (shortcutProps, strokeWidth = 1) => {
+const convertStrokeShortcut = (shortcutProps, oriStrokeWidth = 1) => {
+  const strokeWidth = Number(oriStrokeWidth);
   return convertStrokeType(
     shortcutProps.dashed ? "dashed" : shortcutProps.denselyDashed ? "denselyDashed" : shortcutProps.looselyDashed ? "looselyDashed" : shortcutProps.dotted ? "dotted" : shortcutProps.denselyDotted ? "denselyDotted" : shortcutProps.looselyDotted ? "looselyDotted" : shortcutProps.dashDot ? "dashDot" : shortcutProps.denselyDashDot ? "denselyDashDot" : shortcutProps.looselyDashDot ? "looselyDashDot" : shortcutProps.dashDashDot ? "dashDashDot" : shortcutProps.denselyDashDashDot ? "denselyDashDashDot" : shortcutProps.looselyDashDashDot ? "looselyDashDashDot" : "solid",
     strokeWidth || 1

package/dist/lib/components/Scope.cjs

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const jsxRuntime = require("../_virtual/jsx-runtime.cjs");
+const jsxRuntime = require("react/jsx-runtime");
+const react = require("react");
 const useScope = require("../hooks/context/useScope.cjs");
 const Group = require("../container/Group.cjs");
-const Scope = (props) => {
-  const { children, ref, ...resProps } = props;
-  return /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(useScope.ScopeContext, { value: resProps, children: /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(Group.default, { ref, children }) });
-};
+const Scope = react.forwardRef((props, ref) => {
+  const { children, ...resProps } = props;
+  const baseScopeValue = useScope.default();
+  return /* @__PURE__ */ jsxRuntime.jsx(useScope.ScopeContext.Provider, { value: { ...baseScopeValue, ...resProps }, children: /* @__PURE__ */ jsxRuntime.jsx(Group.default, { ref, children }) });
+});
 exports.default = Scope;

package/dist/lib/components/Scope.d.ts

@@ -1,6 +1,6 @@
-import { FC, PropsWithChildren } from 'react';
+import { PropsWithChildren } from 'react';
 import { ScopeProps as ScopeContextProps } from '../hooks/context/useScope';
 import { GroupProps } from '../container/Group';
 export type ScopeProps = ScopeContextProps & Omit<GroupProps, 'offset'>;
-declare const Scope: FC<PropsWithChildren<ScopeProps>>;
+declare const Scope: import('react').ForwardRefExoticComponent<Omit<PropsWithChildren<ScopeProps>, "ref"> & import('react').RefAttributes<SVGGElement>>;
 export default Scope;

package/dist/lib/components/TikZ.cjs

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const jsxRuntime = require("../_virtual/jsx-runtime.cjs");
+const jsxRuntime = require("react/jsx-runtime");
 const Surface = require("../container/Surface.cjs");
 const useCalculate = require("../hooks/context/useCalculate.cjs");
 const useNodes = require("../hooks/context/useNodes.cjs");
 const useScope = require("../hooks/context/useScope.cjs");
 const TikZ = (props) => {
   const { precision = 2, offset, node, draw, ...resProps } = props;
-  return /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(useNodes.NodesContext, { value: /* @__PURE__ */ new Map(), children: /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(useCalculate.CalculateContext, { value: { precision }, children: /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(useScope.ScopeContext, { value: { offset, node, draw }, children: /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(Surface.default, { ...resProps }) }) }) });
+  return /* @__PURE__ */ jsxRuntime.jsx(useNodes.NodesContext.Provider, { value: /* @__PURE__ */ new Map(), children: /* @__PURE__ */ jsxRuntime.jsx(useCalculate.CalculateContext.Provider, { value: { precision }, children: /* @__PURE__ */ jsxRuntime.jsx(useScope.ScopeContext.Provider, { value: { offset, node, draw }, children: /* @__PURE__ */ jsxRuntime.jsx(Surface.default, { ...resProps }) }) }) });
 };
 exports.default = TikZ;

package/dist/lib/components/draw/Draw.cjs

@@ -1,24 +1,49 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const jsxRuntime = require("../../_virtual/jsx-runtime.cjs");
+const jsxRuntime = require("react/jsx-runtime");
+const react = require("react");
 const useScope = require("../../hooks/context/useScope.cjs");
 const DescartesPoint = require("../../model/geometry/point/DescartesPoint.cjs");
 const stroke = require("../../utils/style/stroke.cjs");
 const InnerDraw = require("./InnerDraw.cjs");
-const Draw = (props) => {
+const Draw = react.forwardRef((props, ref) => {
   const { draw: scopeProps } = useScope.default();
   const realProps = { ...scopeProps, ...props };
-  const { offset, color, stroke: stroke$1, strokeWidth, startArrow, startArrows, endArrow, endArrows, ...drawProps } = realProps;
+  const { offset, color, stroke: stroke$1, strokeWidth, startArrow, startArrows, endArrow, endArrows, ...resProps } = realProps;
   const realStroke = stroke$1 || color;
   const realStartArrow = typeof startArrow === "string" ? { type: startArrow } : startArrow;
   const realStartArrows = typeof startArrows === "string" ? { type: startArrows } : startArrows;
   const realEndArrow = typeof endArrow === "string" ? { type: endArrow } : endArrow;
   const realEndArrows = typeof endArrows === "string" ? { type: endArrows } : endArrows;
   const convertOffset = offset ? DescartesPoint.default.formatPosition(offset) : [0, 0];
-  const getStrokeTypes = () => drawProps.strokeType ? stroke.convertStrokeType(drawProps.strokeType, strokeWidth || 1) : stroke.convertStrokeShortcut(drawProps, strokeWidth || 1);
-  return /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(
+  const getStrokeTypes = () => resProps.strokeType ? stroke.convertStrokeType(resProps.strokeType, strokeWidth ?? 1) : stroke.convertStrokeShortcut(resProps, strokeWidth ?? 1);
+  const drawProps = react.useMemo(() => {
+    const props2 = { ...resProps };
+    [
+      "solid",
+      "dashed",
+      "denselyDashed",
+      "looselyDashed",
+      "dotted",
+      "denselyDotted",
+      "looselyDotted",
+      "dashDot",
+      "denselyDashDot",
+      "looselyDashDot",
+      "dashDashDot",
+      "denselyDashDashDot",
+      "looselyDashDashDot"
+    ].forEach((key) => {
+      if (key in props2) {
+        delete props2[key];
+      }
+    });
+    return props2;
+  }, [props]);
+  return /* @__PURE__ */ jsxRuntime.jsx(
     InnerDraw.default,
     {
+      ref,
       ...getStrokeTypes(),
       offset: convertOffset,
       stroke: realStroke,
@@ -30,5 +55,5 @@ const Draw = (props) => {
       ...drawProps
     }
   );
-};
+});
 exports.default = Draw;

package/dist/lib/components/draw/Draw.d.ts

@@ -1,10 +1,9 @@
-import { FC, ReactElement, Ref } from 'react';
+import { ReactElement } from 'react';
 import { PointPosition } from '../../types/coordinate';
 import { StrokeProps } from '../../types/svg/stroke';
 import { StrokeShortcutProps, StrokeType } from '../../utils/style/stroke';
 import { ArrowProps, DrawWayType } from './types';
 export type DrawProps = {
-    ref?: Ref<SVGPathElement>;
     way: DrawWayType[];
     /** 位置偏移 */
     offset?: PointPosition;
@@ -14,5 +13,14 @@ export type DrawProps = {
     strokeType?: StrokeType;
     children?: ReactElement | ReactElement[] | null;
 } & StrokeProps & StrokeShortcutProps & ArrowProps;
-declare const Draw: FC<DrawProps>;
+declare const Draw: import('react').ForwardRefExoticComponent<{
+    way: DrawWayType[];
+    /** 位置偏移 */
+    offset?: PointPosition;
+    /** 同 stroke */
+    color?: string;
+    /** 线段样式快捷属性 */
+    strokeType?: StrokeType;
+    children?: ReactElement | ReactElement[] | null;
+} & StrokeProps & StrokeShortcutProps & ArrowProps & import('react').RefAttributes<SVGPathElement>>;
 export default Draw;

package/dist/lib/components/draw/InnerDraw.cjs

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const jsxRuntime = require("../../_virtual/jsx-runtime.cjs");
-const require$$0 = require("react");
+const jsxRuntime = require("react/jsx-runtime");
+const react = require("react");
 const Group = require("../../container/Group.cjs");
 const usePath = require("../../hooks/context/usePath.cjs");
 const path = require("../../model/component/path.cjs");
 const common = require("./common.cjs");
 const index = require("./segment/index.cjs");
-const InnerDraw = (props) => {
-  const { way, ref, offset, startArrow, startArrows, endArrow, endArrows, children, ...strokeProps } = props;
-  const waySegments = require$$0.useMemo(() => {
+const InnerDraw = react.forwardRef((props, ref) => {
+  const { way, offset, startArrow, startArrows, endArrow, endArrows, children, ...strokeProps } = props;
+  const waySegments = react.useMemo(() => {
     let preNodeType = "coordinate";
     const waySegments2 = [];
     let waySegment = [];
@@ -28,20 +28,25 @@ const InnerDraw = (props) => {
     }
     return waySegments2;
   }, [way]);
-  return /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(usePath.PathContext, { value: new path.default(new Array(waySegments.length).fill([]), strokeProps.strokeWidth || 1, false), children: /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsxs(Group.default, { ref, transform: `translate(${offset[0]}, ${offset[1]})`, children: [
-    waySegments.map((segment, index$1) => /* @__PURE__ */ jsxRuntime.jsxRuntimeExports.jsx(
-      index.default,
-      {
-        index: index$1,
-        isLastSegment: index$1 === waySegments.length - 1,
-        way: segment,
-        ...strokeProps,
-        endArrow: index$1 === waySegments.length - 1 ? endArrow || endArrows : endArrows,
-        startArrow: index$1 === waySegments.length - 1 ? startArrow || startArrows : startArrows
-      },
-      JSON.stringify(segment)
-    )),
-    children
-  ] }) });
-};
+  return /* @__PURE__ */ jsxRuntime.jsx(
+    usePath.PathContext.Provider,
+    {
+      value: new path.default(new Array(waySegments.length).fill([]), Number(strokeProps.strokeWidth) || 1, false),
+      children: /* @__PURE__ */ jsxRuntime.jsxs(Group.default, { ref, transform: `translate(${offset[0]}, ${offset[1]})`, children: [
+        waySegments.map((segment, index$1) => /* @__PURE__ */ jsxRuntime.jsx(
+          index.default,
+          {
+            index: index$1,
+            way: segment,
+            ...strokeProps,
+            endArrow: index$1 === waySegments.length - 1 ? endArrow || endArrows : endArrows,
+            startArrow: index$1 === waySegments.length - 1 ? startArrow || startArrows : startArrows
+          },
+          JSON.stringify(segment)
+        )),
+        children
+      ] })
+    }
+  );
+});
 exports.default = InnerDraw;

package/dist/lib/components/draw/InnerDraw.d.ts

@@ -1,13 +1,17 @@
-import { FC, ReactNode, Ref } from 'react';
+import { ReactNode } from 'react';
 import { Position } from '../../types/coordinate/descartes';
 import { StrokeProps } from '../../types/svg/stroke';
 import { ArrowConfig, ArrowProps, DrawWayType } from './types';
 export type InnerDrawProps = {
-    ref?: Ref<SVGPathElement>;
     /** 位置偏移 */
     offset: Position;
     way: DrawWayType[];
     children?: ReactNode;
 } & StrokeProps & ArrowProps<ArrowConfig>;
-declare const InnerDraw: FC<InnerDrawProps>;
+declare const InnerDraw: import('react').ForwardRefExoticComponent<{
+    /** 位置偏移 */
+    offset: Position;
+    way: DrawWayType[];
+    children?: ReactNode;
+} & StrokeProps & ArrowProps<ArrowConfig> & import('react').RefAttributes<SVGPathElement>>;
 export default InnerDraw;

package/dist/lib/components/draw/arrow/circle.cjs

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const getCirclePath = (attributes) => {
+  const {
+    width = 5,
+    left = false,
+    right = false,
+    scale = 1
+  } = attributes;
+  const radius = width / 2 * scale;
+  const diameter = width * scale;
+  const startPoint = [0, 0];
+  const path = `M ${startPoint.join(",")} ` + (left ? `A ${radius},${radius} 0 1,0 ${-diameter},0 Z` : right ? `A ${radius},${radius} 0 1,1 ${-diameter},0 Z` : `A ${radius},${radius} 0 1,0 ${-diameter},0A ${radius},${radius} 0 1,0 ${startPoint.join(",")} Z`);
+  return {
+    d: path,
+    offsetDistance: radius,
+    insertDistance: radius
+  };
+};
+exports.default = getCirclePath;

package/dist/lib/components/draw/arrow/circle.d.ts

@@ -0,0 +1,7 @@
+import { ArrowAttributes } from './types';
+declare const getCirclePath: (attributes: ArrowAttributes) => {
+    d: string;
+    offsetDistance: number;
+    insertDistance: number;
+};
+export default getCirclePath;