diff --git a/__tests__/snapshot/core/examples/test/api.html.jpg b/__tests__/snapshot/core/examples/test/api.html.jpg index 51014b6..2d3a8b7 100644 Binary files a/__tests__/snapshot/core/examples/test/api.html.jpg and b/__tests__/snapshot/core/examples/test/api.html.jpg differ diff --git a/__tests__/snapshot/core/examples/test/elements.html.jpg b/__tests__/snapshot/core/examples/test/elements.html.jpg index 11af43d..378b073 100644 Binary files a/__tests__/snapshot/core/examples/test/elements.html.jpg and b/__tests__/snapshot/core/examples/test/elements.html.jpg differ diff --git a/__tests__/snapshot/idraw/examples/test/api.html.jpg b/__tests__/snapshot/idraw/examples/test/api.html.jpg index ac4d98d..0ddd702 100644 Binary files a/__tests__/snapshot/idraw/examples/test/api.html.jpg and b/__tests__/snapshot/idraw/examples/test/api.html.jpg differ diff --git a/lerna.json b/lerna.json index 3f71527..4b3144a 100644 --- a/lerna.json +++ b/lerna.json @@ -7,5 +7,5 @@ "packages/core", "packages/idraw" ], - "version": "0.2.0-alpha.23" + "version": "0.2.0-alpha.24" } diff --git a/packages/board/package.json b/packages/board/package.json index 938819a..695ad60 100644 --- a/packages/board/package.json +++ b/packages/board/package.json @@ -1,6 +1,6 @@ { "name": "@idraw/board", - "version": "0.2.0-alpha.23", + "version": "0.2.0-alpha.24", "description": "", "main": "dist/index.cjs.js", "module": "dist/index.es.js", @@ -24,10 +24,10 @@ "author": "chenshenhai", "license": "MIT", "devDependencies": { - "@idraw/types": "^0.2.0-alpha.23" + "@idraw/types": "^0.2.0-alpha.24" }, "dependencies": { - "@idraw/util": "^0.2.0-alpha.23" + "@idraw/util": "^0.2.0-alpha.24" }, "publishConfig": { "access": "public" diff --git a/packages/core/examples/features/lib/main.js b/packages/core/examples/features/lib/main.js index 3fc5310..41422a3 100644 --- a/packages/core/examples/features/lib/main.js +++ b/packages/core/examples/features/lib/main.js @@ -31,7 +31,7 @@ const core = new Core(mount, { }, elementWrapper: { lockColor: '#009688', - color: '#e91e63', + color: '#009688', controllerSize: 6, lineWidth: 1, // lineDash: [12, 12], diff --git a/packages/core/package.json b/packages/core/package.json index ece96f8..171a04c 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@idraw/core", - "version": "0.2.0-alpha.23", + "version": "0.2.0-alpha.24", "description": "", "main": "dist/index.cjs.js", "module": "dist/index.es.js", @@ -24,12 +24,12 @@ "author": "chenshenhai", "license": "MIT", "devDependencies": { - "@idraw/types": "^0.2.0-alpha.23" + "@idraw/types": "^0.2.0-alpha.24" }, "dependencies": { - "@idraw/board": "^0.2.0-alpha.23", - "@idraw/renderer": "^0.2.0-alpha.23", - "@idraw/util": "^0.2.0-alpha.23" + "@idraw/board": "^0.2.0-alpha.24", + "@idraw/renderer": "^0.2.0-alpha.24", + "@idraw/util": "^0.2.0-alpha.24" }, "publishConfig": { "access": "public" diff --git a/packages/core/src/lib/helper.ts b/packages/core/src/lib/helper.ts index 9b30d77..06769b0 100644 --- a/packages/core/src/lib/helper.ts +++ b/packages/core/src/lib/helper.ts @@ -324,49 +324,53 @@ export class Helper implements TypeHelper { if (typeof elem.angle === 'number' && Math.abs(elem.angle) > limitQbliqueAngle) { hideObliqueDirection = true; } + // TODO + // const controllerOffset = controllerSize; + const controllerOffset = lineWidth; const wrapper: TypeHeplerSelectedElementWrapper = { uuid: elem.uuid, controllerSize: controllerSize, + controllerOffset: controllerOffset, lock: elem?.operation?.lock === true, controllers: { topLeft: { - x: elem.x - controllerSize - bw, - y: elem.y - controllerSize - bw, + x: elem.x - controllerOffset - bw, + y: elem.y - controllerOffset - bw, invisible: hideObliqueDirection || elem?.operation?.disbaleScale === true, }, top: { x: elem.x + elem.w / 2, - y: elem.y - controllerSize - bw, + y: elem.y - controllerOffset - bw, invisible: elem?.operation?.disbaleScale === true, }, topRight: { - x: elem.x + elem.w + controllerSize + bw, - y: elem.y - controllerSize - bw, + x: elem.x + elem.w + controllerOffset + bw, + y: elem.y - controllerOffset - bw, invisible: hideObliqueDirection || elem?.operation?.disbaleScale === true, }, right: { - x: elem.x + elem.w + controllerSize + bw, + x: elem.x + elem.w + controllerOffset + bw, y: elem.y + elem.h / 2, invisible: elem?.operation?.disbaleScale === true }, bottomRight: { - x: elem.x + elem.w + controllerSize + bw, - y: elem.y + elem.h + controllerSize + bw, + x: elem.x + elem.w + controllerOffset + bw, + y: elem.y + elem.h + controllerOffset + bw, invisible: hideObliqueDirection || elem?.operation?.disbaleScale === true, }, bottom: { x: elem.x + elem.w / 2, - y: elem.y + elem.h + controllerSize + bw, + y: elem.y + elem.h + controllerOffset + bw, invisible: elem?.operation?.disbaleScale === true, }, bottomLeft: { - x: elem.x - controllerSize - bw, - y: elem.y + elem.h + controllerSize + bw, + x: elem.x - controllerOffset - bw, + y: elem.y + elem.h + controllerOffset + bw, invisible: hideObliqueDirection || elem?.operation?.disbaleScale === true, }, left: { - x: elem.x - controllerSize - bw, + x: elem.x - controllerOffset - bw, y: elem.y + elem.h / 2, invisible: elem?.operation?.disbaleScale === true }, diff --git a/packages/idraw/package.json b/packages/idraw/package.json index 3b0660a..f0c15fa 100644 --- a/packages/idraw/package.json +++ b/packages/idraw/package.json @@ -1,6 +1,6 @@ { "name": "idraw", - "version": "0.2.0-alpha.23", + "version": "0.2.0-alpha.24", "description": "", "main": "dist/index.cjs.js", "module": "dist/index.es.js", @@ -24,11 +24,11 @@ "author": "chenshenhai", "license": "MIT", "devDependencies": { - "@idraw/types": "^0.2.0-alpha.23" + "@idraw/types": "^0.2.0-alpha.24" }, "dependencies": { - "@idraw/core": "^0.2.0-alpha.23", - "@idraw/util": "^0.2.0-alpha.23" + "@idraw/core": "^0.2.0-alpha.24", + "@idraw/util": "^0.2.0-alpha.24" }, "publishConfig": { "access": "public" diff --git a/packages/renderer/package.json b/packages/renderer/package.json index ae6f384..aaa845e 100644 --- a/packages/renderer/package.json +++ b/packages/renderer/package.json @@ -1,6 +1,6 @@ { "name": "@idraw/renderer", - "version": "0.2.0-alpha.23", + "version": "0.2.0-alpha.24", "description": "", "main": "dist/index.cjs.js", "module": "dist/index.es.js", @@ -24,10 +24,10 @@ "author": "chenshenhai", "license": "MIT", "devDependencies": { - "@idraw/types": "^0.2.0-alpha.23" + "@idraw/types": "^0.2.0-alpha.24" }, "dependencies": { - "@idraw/util": "^0.2.0-alpha.23" + "@idraw/util": "^0.2.0-alpha.24" }, "publishConfig": { "access": "public" diff --git a/packages/types/package.json b/packages/types/package.json index f3401e1..77574ab 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@idraw/types", - "version": "0.2.0-alpha.23", + "version": "0.2.0-alpha.24", "description": "", "main": "src/index.ts", "types": "src/index.ts", diff --git a/packages/types/src/lib/helper.ts b/packages/types/src/lib/helper.ts index a32b90d..b319911 100644 --- a/packages/types/src/lib/helper.ts +++ b/packages/types/src/lib/helper.ts @@ -10,6 +10,7 @@ type TypeController = TypePoint & { type TypeHeplerSelectedElementWrapper = { uuid: string; controllerSize: number; + controllerOffset: number; lock: boolean; controllers: { topLeft: TypeController, diff --git a/packages/util/package.json b/packages/util/package.json index b3c5b90..44e2068 100644 --- a/packages/util/package.json +++ b/packages/util/package.json @@ -1,6 +1,6 @@ { "name": "@idraw/util", - "version": "0.2.0-alpha.23", + "version": "0.2.0-alpha.24", "description": "", "main": "dist/index.cjs.js", "module": "dist/index.es.js", @@ -24,7 +24,7 @@ "author": "chenshenhai", "license": "MIT", "devDependencies": { - "@idraw/types": "^0.2.0-alpha.23" + "@idraw/types": "^0.2.0-alpha.24" }, "publishConfig": { "access": "public"