Skip to content

Commit a4e451c

Browse files
committed
chore: 导出computeComponentBBox方法
1 parent 9217c83 commit a4e451c

5 files changed

Lines changed: 10 additions & 62 deletions

File tree

packages/f-engine/src/canvas/render/computeComponent.ts

Lines changed: 0 additions & 52 deletions
This file was deleted.

packages/f-engine/src/canvas/render/computeLayout.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ function renderJSXElement(element: JSX.Element, context, updater) {
188188

189189
const vNode = {
190190
key: undefined,
191-
tag: ClassComponent,
191+
tag,
192192
type,
193193
props,
194194
context,
@@ -215,7 +215,7 @@ function computeLayout(component: Component, newChildren: JSX.Element) {
215215
return new NodeTree(nodeTree);
216216
}
217217

218-
export function createChildNodeTree(parent: VNode, vNodeChildren: VNode | VNode[]) {
218+
function createChildNodeTree(parent: VNode, vNodeChildren: VNode | VNode[]) {
219219
const { tag } = parent;
220220
const children = extendMap(vNodeChildren, (child: VNode) => {
221221
const { tag: childTag, style: childStyle, children: childChildren } = child;
@@ -320,7 +320,7 @@ function traverseNodeTreeAndCreateShapes(node, parentShape, context) {
320320
if (!node) return;
321321

322322
const { type, children, style: originStyle, vNode } = node;
323-
const { style: customStyle = {}, attrs } = vNode;
323+
const { style: customStyle = {}, attrs = {} } = vNode;
324324

325325
const style = context.px2hd({
326326
...originStyle,

packages/f-engine/src/canvas/render/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
computeCSSLayout,
1717
fillElementLayout,
1818
fillComponentLayout,
19+
computeComponentBBox,
1920
} from './computeLayout';
2021
import findClosestShapeNode from './findClosestShapeNode';
2122

@@ -28,7 +29,7 @@ function pickElement(element: JSX.Element | JSX.Element[] | null) {
2829
});
2930
}
3031

31-
export function getStyle(tagType: WorkTag, props, context) {
32+
function getStyle(tagType: WorkTag, props, context) {
3233
const { style: customStyle = {}, attrs, zIndex } = props;
3334

3435
if (tagType === Shape) {
@@ -444,6 +445,7 @@ export {
444445
render,
445446
renderChildren,
446447
updateComponents,
448+
computeComponentBBox,
447449
computeLayout,
448450
destroyElement,
449451
getUpdateAnimation,

packages/f-engine/src/index.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
import { computeLayout } from './canvas/render';
2-
import { computeComponent } from './canvas/render/computeComponent';
1+
import { computeLayout, computeComponentBBox } from './canvas/render';
32
import { Renderer as CanvasRenderer } from '@antv/g-mobile-canvas';
43
import { parseColor } from '@antv/g-lite';
54
import * as Smooth from './shape/util/smooth';
@@ -15,7 +14,7 @@ export { default as createRef } from './createRef';
1514
export { default as createContext } from './createContext';
1615
export { default as Timeline, TimelineProps } from './timeline';
1716
export { default as Gesture } from './gesture';
18-
export { CanvasRenderer, computeLayout, computeComponent, Smooth, parseColor };
17+
export { CanvasRenderer, computeLayout, computeComponentBBox, Smooth, parseColor };
1918
export { default as isEqual } from './canvas/equal';
2019

2120
export { default as Player, PlayerProps } from './player';

packages/f-engine/test/canvas/render/computeComponent.test.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { jsx, Canvas, Component } from '../../../src';
2-
import { computeComponent } from '../../../src/canvas/render/computeComponent';
2+
import { computeComponentBBox } from '../../../src/canvas/render';
33
import { createContext, delay } from '@antv/f-test-utils';
44

55
class View extends Component {
@@ -62,7 +62,6 @@ class ViewText extends Component {
6262
x: position[0],
6363
y: position[1],
6464
text: 'hello',
65-
// textBaseline: 'middle',
6665
}}
6766
/>
6867
);
@@ -80,7 +79,7 @@ class GuideGroup extends Component {
8079
const component = new child.type(child.props, context, updater);
8180
component.context = context;
8281

83-
const bbox = computeComponent(this, component.render());
82+
const bbox = computeComponentBBox(this, component.render());
8483
this.bbox.push(bbox);
8584
});
8685
}

0 commit comments

Comments
 (0)