Skip to content

Commit a87b8fc

Browse files
committed
fix: Content allow to disable renderOrder on children using renderOrder={null}
1 parent 5c551f0 commit a87b8fc

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

packages/uikit/src/components/content.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,10 @@ export type InheritableContentProperties = WithClasses<
4848
ZIndexProperties &
4949
TransformProperties &
5050
ScrollbarProperties &
51-
PanelGroupProperties &
51+
Omit<PanelGroupProperties, 'renderOrder'> &
5252
DepthAlignProperties &
5353
KeepAspectRatioProperties &
5454
VisibilityProperties &
55-
RenderProperties &
5655
PointerEventsProperties
5756
>
5857
>
@@ -61,6 +60,7 @@ export type InheritableContentProperties = WithClasses<
6160

6261
export type DepthAlignProperties = {
6362
depthAlign?: keyof typeof alignmentZMap
63+
renderOrder?: null | number
6464
}
6565

6666
export type ContentProperties<EM extends ThreeEventMap = ThreeEventMap> = InheritableContentProperties &
@@ -352,7 +352,7 @@ function createMeasureContent(
352352
function updateRenderProperties(
353353
contentContainerRef: { current?: Object3D | null },
354354
visible: boolean,
355-
renderOrder: number,
355+
renderOrder: number | null,
356356
depthTest: boolean,
357357
depthWrite: boolean,
358358
) {
@@ -365,7 +365,9 @@ function updateRenderProperties(
365365
if (!(object instanceof Mesh)) {
366366
return
367367
}
368-
object.renderOrder = renderOrder
368+
if (renderOrder != null) {
369+
object.renderOrder = renderOrder
370+
}
369371
if (!(object.material instanceof Material)) {
370372
return
371373
}

0 commit comments

Comments
 (0)