Skip to content

Don't calculate sizes for Box that has Box children #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 13, 2021
Merged

Don't calculate sizes for Box that has Box children #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions src/Flex.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useLayoutEffect, useMemo, useCallback, PropsWithChildren, useRef } from 'react'
import Yoga, { YogaNode } from 'yoga-layout-prebuilt'
import { Vector3, Group, Box3 } from 'three'
import { Vector3, Group, Box3, Object3D } from 'three'
import { useFrame, useThree, ReactThreeFiber } from '@react-three/fiber'

import { setYogaProperties, rmUndefFromObj, vectorFromObject, Axis, getDepthAxis, getFlex2DSize } from './util'
Expand All @@ -22,6 +22,18 @@ export type FlexProps = PropsWithChildren<
R3FlexProps &
Omit<ReactThreeFiber.Object3DNode<THREE.Group, typeof Group>, 'children'>
>
interface BoxesItem {
node: YogaNode
group: Group
flexProps: R3FlexProps
centerAnchor: boolean
}

// This is not very performant
// We should probably optimize it, options are
// * Memoization
// * Precalculation of this when registering a box
const hasBoxChildren = (boxes: BoxesItem[], children: Object3D[]) => boxes.some(({ group }) => children.includes(group))

/**
* Flex container. Can contain Boxes
Expand Down Expand Up @@ -198,7 +210,7 @@ export function Flex({
])

// Keeps track of the yoga nodes of the children and the related wrapper groups
const boxesRef = useRef<{ node: YogaNode; group: Group; flexProps: R3FlexProps; centerAnchor: boolean }[]>([])
const boxesRef = useRef<BoxesItem[]>([])
const registerBox = useCallback(
(node: YogaNode, group: Group, flexProps: R3FlexProps, centerAnchor: boolean = false) => {
const i = boxesRef.current.findIndex((b) => b.node === node)
Expand Down Expand Up @@ -272,7 +284,7 @@ export function Flex({
// Forced size, no need to calculate bounding box
node.setWidth(scaledWidth)
node.setHeight(scaledHeight)
} else {
} else if (!hasBoxChildren(boxesRef.current, group.children)) {
// No size specified, calculate bounding box
boundingBox.setFromObject(group).getSize(vec)
node.setWidth(scaledWidth || vec[mainAxis] * scaleFactor)
Expand Down