From 32b02e9ff731af0eb9a32a7ea2d292a3ef4be1d8 Mon Sep 17 00:00:00 2001
From: chenshenhai <cshenhai@gmail.com>
Date: Sun, 27 Feb 2022 17:20:53 +0800
Subject: [PATCH] refactor: refactor @idraw/board export

---
 packages/board/package.json              | 2 +-
 packages/board/src/default.ts            | 3 +++
 packages/board/src/esm.ts                | 5 +++++
 packages/board/src/index.ts              | 9 +++------
 packages/board/src/lib/istype.ts         | 4 ++--
 packages/board/src/lib/screen-watcher.ts | 3 +--
 packages/board/src/lib/scroller.ts       | 4 ++--
 packages/board/src/lib/temp.ts           | 4 +---
 packages/renderer/package.json           | 2 +-
 9 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 packages/board/src/default.ts
 create mode 100644 packages/board/src/esm.ts

diff --git a/packages/board/package.json b/packages/board/package.json
index 3c91513..82ca63b 100644
--- a/packages/board/package.json
+++ b/packages/board/package.json
@@ -3,7 +3,7 @@
   "version": "0.2.0-alpha.26",
   "description": "",
   "main": "dist/index.cjs.js",
-  "module": "dist/index.es.js",
+  "module": "dist/index.esm.js",
   "unpkg": "dist/index.global.js",
   "types": "dist/index.d.ts",
   "scripts": {
diff --git a/packages/board/src/default.ts b/packages/board/src/default.ts
new file mode 100644
index 0000000..ca8151d
--- /dev/null
+++ b/packages/board/src/default.ts
@@ -0,0 +1,3 @@
+import { Board } from './index';
+
+export default Board;
\ No newline at end of file
diff --git a/packages/board/src/esm.ts b/packages/board/src/esm.ts
new file mode 100644
index 0000000..880acc2
--- /dev/null
+++ b/packages/board/src/esm.ts
@@ -0,0 +1,5 @@
+import { Board } from './index';
+
+export * from './index';
+
+export default Board;
\ No newline at end of file
diff --git a/packages/board/src/index.ts b/packages/board/src/index.ts
index e341d55..bb4fb5c 100644
--- a/packages/board/src/index.ts
+++ b/packages/board/src/index.ts
@@ -2,7 +2,7 @@ import {
   TypeScreenPosition, TypeScreenSize, TypeScreenContext, TypePoint, TypePointCursor,
   TypeBoardOptions, TypeBoardSizeOptions, TypeContext, 
 } from '@idraw/types';
-import util from '@idraw/util';
+import { throttle, Context } from '@idraw/util';
 import { ScreenWatcher } from './lib/screen-watcher';
 import { setStyle } from './lib/style';
 import { TypeBoardEventArgMap } from './lib/event';
@@ -16,14 +16,11 @@ import {
   _screen, _tempData
 } from './names';
 
-const { Context } = util;
-const { throttle } = util.time;
-
 type PrivateOptions = TypeBoardOptions & {
   devicePixelRatio: number
 }
 
-class Board {
+export class Board {
 
   private [_hasRendered] = false;
 
@@ -342,5 +339,5 @@ class Board {
 
 }
 
-export default Board;
+ 
 
diff --git a/packages/board/src/lib/istype.ts b/packages/board/src/lib/istype.ts
index c13a8bb..71dc7f4 100644
--- a/packages/board/src/lib/istype.ts
+++ b/packages/board/src/lib/istype.ts
@@ -1,3 +1,3 @@
-import util from '@idraw/util';
+import { istype } from '@idraw/util';
 
-export default util.istype;
\ No newline at end of file
+export default istype;
\ No newline at end of file
diff --git a/packages/board/src/lib/screen-watcher.ts b/packages/board/src/lib/screen-watcher.ts
index a425c2f..5a8f833 100644
--- a/packages/board/src/lib/screen-watcher.ts
+++ b/packages/board/src/lib/screen-watcher.ts
@@ -1,5 +1,4 @@
-import { TypePoint, TypeContext } from '@idraw/types';
-// import util from '@idraw/util';
+import { TypePoint, TypeContext } from '@idraw/types'; 
 import { BoardEvent, TypeBoardEventArgMap } from './event';
 import { TempData } from './watcher-temp';
 
diff --git a/packages/board/src/lib/scroller.ts b/packages/board/src/lib/scroller.ts
index 977886f..4c5048a 100644
--- a/packages/board/src/lib/scroller.ts
+++ b/packages/board/src/lib/scroller.ts
@@ -3,7 +3,7 @@ import {
   TypeScreenPosition,
   TypeBoardScrollConfig,
 } from '@idraw/types';
-import util from '@idraw/util';
+import { isColorStr } from '@idraw/util';
 
 type TypeOptions = {
   width: number,
@@ -184,7 +184,7 @@ export class Scroller {
     }
     options.scrollConfig.lineWidth = Math.max(options.scrollConfig.lineWidth, defaultScrollConfig.lineWidth);
 
-    if (util.color.isColorStr(options.scrollConfig.color) !== true) {
+    if (isColorStr(options.scrollConfig.color) !== true) {
       options.scrollConfig.color = options.scrollConfig.color;
     }
     return options;
diff --git a/packages/board/src/lib/temp.ts b/packages/board/src/lib/temp.ts
index 110cc37..f3822ce 100644
--- a/packages/board/src/lib/temp.ts
+++ b/packages/board/src/lib/temp.ts
@@ -1,7 +1,5 @@
 import { TypeBoardOptions, TypeContext } from '@idraw/types';
-import util from '@idraw/util';
-
-const Context = util.Context;
+import { Context } from '@idraw/util';
 
 type TempDataDesc = {
   ctx: TypeContext,
diff --git a/packages/renderer/package.json b/packages/renderer/package.json
index fdbdc3f..c430451 100644
--- a/packages/renderer/package.json
+++ b/packages/renderer/package.json
@@ -3,7 +3,7 @@
   "version": "0.2.0-alpha.26",
   "description": "",
   "main": "dist/index.cjs.js",
-  "module": "dist/index.es.js",
+  "module": "dist/index.esm.js",
   "unpkg": "dist/index.global.js",
   "types": "dist/index.d.ts",
   "scripts": {