Skip to content

Commit eb3fdb1

Browse files
committed
refactor: import connector utils directly from preset-geometry
Drop the connector re-export barrel in shared/svg-utils.js and have ShapeGroupView, VectorShapeView, and the svg-utils test import connector helpers directly from @superdoc/preset-geometry/connectors.
1 parent f0a3f31 commit eb3fdb1

4 files changed

Lines changed: 11 additions & 30 deletions

File tree

packages/super-editor/src/editors/v1/extensions/shape-group/ShapeGroupView.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ import { getPresetShapeSvg } from '@superdoc/preset-geometry';
33
import {
44
applyNonScalingStrokeToConnectorTarget,
55
createConnectorPresetSvg,
6+
isConnectorPresetShape,
7+
} from '@superdoc/preset-geometry/connectors';
8+
import {
69
createGradient,
710
createLineEndMarker,
811
createPictureFillPattern,
912
createTextElement,
10-
isConnectorPresetShape,
1113
} from '../shared/svg-utils.js';
1214
import { OOXML_Z_INDEX_BASE } from '@extensions/shared/constants.js';
1315

packages/super-editor/src/editors/v1/extensions/shared/svg-utils.js

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,9 @@
11
import { formatChapterPageNumberText, formatPageNumber } from '@superdoc/contracts';
22
import {
3-
applyNonScalingStrokeToConnector,
4-
applyNonScalingStrokeToConnectorTarget,
5-
createConnectorPresetSvg,
63
createLineEndMarker as createLineEndMarkerWithDocument,
74
createLineEndShape as createLineEndShapeWithDocument,
8-
formatSvgNumber,
9-
getConnectorPresetPath,
10-
getConnectorStrokePadding,
11-
isConnectorPresetShape,
125
} from '@superdoc/preset-geometry/connectors';
136

14-
export {
15-
applyNonScalingStrokeToConnector,
16-
applyNonScalingStrokeToConnectorTarget,
17-
createConnectorPresetSvg,
18-
formatSvgNumber,
19-
getConnectorPresetPath,
20-
getConnectorStrokePadding,
21-
isConnectorPresetShape,
22-
};
23-
247
export function createLineEndShape(type, strokeColor, isStart) {
258
return createLineEndShapeWithDocument(document, type, strokeColor, isStart);
269
}

packages/super-editor/src/editors/v1/extensions/shared/svg-utils.test.js

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,8 @@
22
* @vitest-environment jsdom
33
*/
44
import { describe, it, expect, beforeEach } from 'vitest';
5-
import {
6-
createTextElement,
7-
createGradient,
8-
createPictureFillPattern,
9-
generateTransforms,
10-
getConnectorPresetPath,
11-
createConnectorPresetSvg,
12-
} from './svg-utils.js';
5+
import { getConnectorPresetPath, createConnectorPresetSvg } from '@superdoc/preset-geometry/connectors';
6+
import { createTextElement, createGradient, createPictureFillPattern, generateTransforms } from './svg-utils.js';
137

148
describe('svg-utils', () => {
159
describe('createPictureFillPattern', () => {

packages/super-editor/src/editors/v1/extensions/vector-shape/VectorShapeView.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
// @ts-expect-error - preset-geometry package may not have type definitions
22
import { getPresetShapeSvg } from '@superdoc/preset-geometry';
3+
import {
4+
applyNonScalingStrokeToConnector,
5+
createConnectorPresetSvg,
6+
formatSvgNumber,
7+
isConnectorPresetShape,
8+
} from '@superdoc/preset-geometry/connectors';
39
import { inchesToPixels } from '@converter/helpers.js';
410
import { OOXML_Z_INDEX_BASE } from '@extensions/shared/constants.js';
511
import {
@@ -8,12 +14,8 @@ import {
814
applyGradientToSVG,
915
applyAlphaToSVG,
1016
generateTransforms,
11-
applyNonScalingStrokeToConnector,
12-
createConnectorPresetSvg,
1317
createLineEndMarker,
1418
createPictureFillPattern,
15-
formatSvgNumber,
16-
isConnectorPresetShape,
1719
} from '../shared/svg-utils.js';
1820

1921
export class VectorShapeView {

0 commit comments

Comments
 (0)