Skip to content

Commit

Permalink
fix: guide超出范围不显示
Browse files Browse the repository at this point in the history
  • Loading branch information
xuying.xu committed Mar 21, 2024
1 parent 860b339 commit a945c8c
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 5 deletions.
2 changes: 2 additions & 0 deletions packages/f2/src/components/guide/views/Arc.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ export interface ArcGuideProps extends GuideProps {
export default (props: ArcGuideProps) => {
const { theme = {} } = props;
const { coord, points, style, animation } = deepMix({ ...theme.line }, props);
const checkNaN = points.some((d)=> isNaN(d.x) || isNaN(d.y))
if(checkNaN) return null;

const start = points[0] || {};
const end = points[1] || {};
Expand Down
2 changes: 2 additions & 0 deletions packages/f2/src/components/guide/views/Image.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ export default (props: ImageGuideProps, context) => {
const cfg = deepMix({}, defaultProps, props);
const { points, style, attrs, offsetX, offsetY, src, animation } = cfg;
const { x, y } = points[0] || {};
if(isNaN(x) || isNaN(y)) return null;

const { height = 0, width = 0 } = { ...attrs, ...style };
const heightNum = context.px2hd(height + 'px');
const widthNum = context.px2hd(width + 'px');
Expand Down
3 changes: 3 additions & 0 deletions packages/f2/src/components/guide/views/Line.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ export interface LineGuideProps extends GuideProps {
export default (props: LineGuideProps, context) => {
const { theme = {} } = props;
const { points, style, offsetX, offsetY, animation } = deepMix({ ...theme.line }, props);
const checkNaN = points.some((d)=> isNaN(d.x) || isNaN(d.y))
if(checkNaN) return;

const { x: x1, y: y1 } = points[0] || {};
const { x: x2, y: y2 } = points[1] || {};

Expand Down
2 changes: 2 additions & 0 deletions packages/f2/src/components/guide/views/Lottie.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ export default (props: LottieGuideProps, context) => {
const cfg = deepMix({}, defaultProps, props);
const { points, style, offsetX, offsetY, lottieJson, animation, options } = cfg;
const { x, y } = points[0] || {};
if(isNaN(x) || isNaN(y)) return null;

const { height = 0, width = 0 } = style;

const offsetXNum = context.px2hd(offsetX);
Expand Down
3 changes: 2 additions & 1 deletion packages/f2/src/components/guide/views/Point.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ export default (props: PointGuideProps, context) => {
const { theme } = props;
const { points, style, offsetX, offsetY, animation } = deepMix({ ...theme.point }, props);
const { x, y } = points[0] || {};

if(isNaN(x) || isNaN(y)) return null;

const offsetXNum = context.px2hd(offsetX);
const offsetYNum = context.px2hd(offsetY);
const posX = x + (offsetXNum || 0);
Expand Down
4 changes: 3 additions & 1 deletion packages/f2/src/components/guide/views/Rect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ export interface RectGuideProps extends GuideProps {
export default (props: RectGuideProps) => {
const { theme = {} } = props;
const { points, style, animation } = deepMix({ ...theme.rect }, props);

const checkNaN = points.some((d)=> isNaN(d.x) || isNaN(d.y))
if(checkNaN) return null;

const start = points[0] || {};
const end = points[1] || {};

Expand Down
3 changes: 2 additions & 1 deletion packages/f2/src/components/guide/views/Tag.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ export default class Tag extends Component<TagGuideProps> {
textStyle,
} = px2hd(cfg);
const { x, y } = points[0] || {};

if(isNaN(x) || isNaN(y)) return null;

const offsetXNum = context.px2hd(offsetX);
const offsetYNum = context.px2hd(offsetY);
let posX = x + (offsetXNum || 0);
Expand Down
1 change: 1 addition & 0 deletions packages/f2/src/components/guide/views/Text.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export default (props: TextGuideProps, context) => {
const { points, style, offsetX, offsetY, content, animation } = deepMix({ ...theme.text }, props);
const { x, y } = points[0] || {};

if(isNaN(x) || isNaN(y)) return null;
const offsetXNum = context.px2hd(offsetX);
const offsetYNum = context.px2hd(offsetY);
const posX = x + (offsetXNum || 0);
Expand Down
2 changes: 0 additions & 2 deletions packages/f2/src/components/guide/withGuide.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,6 @@ export default function<IProps extends GuideProps = GuideProps>(
const { width, height } = context;
const points = this.convertPoints(records);
const theme = this.getGuideTheme();
const checkNaN = points.some((d)=> isNaN(d.x) || isNaN(d.y))
if(checkNaN) return;

return (
<group
Expand Down

0 comments on commit a945c8c

Please sign in to comment.