Set composition locals before popup window content

Same as in https://github.com/JetBrains/androidx/pull/71/files#diff-7a205e615364664297d030c678597dd1730f6c72d27b2713abb94638b7dd3db2
kirill-grouchnikov · Nov 12, 2021 · a9f9e3e · a9f9e3e
1 parent 3f22898
commit a9f9e3e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/component/src/desktopMain/kotlin/org/pushingpixels/aurora/component/AuroraComboBox.kt b/component/src/desktopMain/kotlin/org/pushingpixels/aurora/component/AuroraComboBox.kt
@@ -214,7 +214,7 @@ internal fun <E> AuroraComboBox(
         )
     )
     val contentModelState = rememberUpdatedState(commandMenuContentModel)
-    val currentLocals by rememberUpdatedState(currentCompositionLocalContext)
+    val compositionLocalContext by rememberUpdatedState(currentCompositionLocalContext)
 
     Box(
         modifier = modifier
@@ -230,7 +230,7 @@ internal fun <E> AuroraComboBox(
                         skinColors = skinColors,
                         skinPainters = painters,
                         decorationAreaType = decorationAreaType,
-                        locals = currentLocals,
+                        compositionLocalContext = compositionLocalContext,
                         anchorBoundsInWindow = Rect(
                             offset = comboBoxTopLeftOffset.asOffset(density),
                             size = comboBoxSize.asSize(density)

diff --git a/component/src/desktopMain/kotlin/org/pushingpixels/aurora/component/AuroraCommandButton.kt b/component/src/desktopMain/kotlin/org/pushingpixels/aurora/component/AuroraCommandButton.kt
@@ -381,7 +381,7 @@ internal fun AuroraCommandButton(
     }
 
     val hasIcon = preLayoutInfo.showIcon
-    val currentLocals by rememberUpdatedState(currentCompositionLocalContext)
+    val compositionLocalContext by rememberUpdatedState(currentCompositionLocalContext)
 
     Layout(
         modifier = modifier.commandButtonLocator(buttonTopLeftOffset, buttonSize),
@@ -634,7 +634,7 @@ internal fun AuroraCommandButton(
                             skinColors = skinColors,
                             skinPainters = painters,
                             decorationAreaType = decorationAreaType,
-                            locals = currentLocals,
+                            compositionLocalContext = compositionLocalContext,
                             anchorBoundsInWindow = Rect(
                                 offset = buttonTopLeftOffset.asOffset(density),
                                 size = buttonSize.asSize(density)

diff --git a/...rc/desktopMain/kotlin/org/pushingpixels/aurora/component/contextmenu/AuroraContextMenu.kt b/...rc/desktopMain/kotlin/org/pushingpixels/aurora/component/contextmenu/AuroraContextMenu.kt
@@ -54,7 +54,7 @@ fun Modifier.auroraContextMenu(
     val painters = AuroraSkin.painters
     val decorationAreaType = AuroraSkin.decorationAreaType
     val window = LocalWindow.current
-    val currentLocals by rememberUpdatedState(currentCompositionLocalContext)
+    val compositionLocalContext by rememberUpdatedState(currentCompositionLocalContext)
 
     val resolvedTextStyle = remember { resolveDefaults(mergedTextStyle, layoutDirection) }
 
@@ -72,7 +72,7 @@ fun Modifier.auroraContextMenu(
                     skinColors = skinColors,
                     skinPainters = painters,
                     decorationAreaType = decorationAreaType,
-                    locals = currentLocals,
+                    compositionLocalContext = compositionLocalContext,
                     anchorBoundsInWindow = Rect(
                         offset = Offset(
                             x = lastMouseEvent.x.toFloat(),

diff --git a/component/src/desktopMain/kotlin/org/pushingpixels/aurora/component/utils/PopupContent.kt b/component/src/desktopMain/kotlin/org/pushingpixels/aurora/component/utils/PopupContent.kt
@@ -70,7 +70,7 @@ internal fun displayPopupContent(
     skinColors: AuroraSkinColors,
     skinPainters: AuroraPainters,
     decorationAreaType: DecorationAreaType,
-    locals: CompositionLocalContext,
+    compositionLocalContext: CompositionLocalContext,
     anchorBoundsInWindow: Rect,
     contentModel: State<CommandMenuContentModel?>,
     presentationModel: CommandPopupMenuPresentationModel,
@@ -367,18 +367,17 @@ internal fun displayPopupContent(
         }
     }
 
+    popupContentWindow.compositionLocalContext = compositionLocalContext
     popupContentWindow.setContent {
-        CompositionLocalProvider(locals) {
-            TopLevelPopupContent(
-                popupContentWindow = popupContentWindow,
-                menuContentModel = contentModel,
-                menuPresentationModel = presentationModel,
-                toDismissPopupsOnActivation = toDismissPopupsOnActivation,
-                toUseBackgroundStriping = toUseBackgroundStriping,
-                overlays = overlays,
-                contentLayoutInfo = contentLayoutInfo
-            )
-        }
+        TopLevelPopupContent(
+            popupContentWindow = popupContentWindow,
+            menuContentModel = contentModel,
+            menuPresentationModel = presentationModel,
+            toDismissPopupsOnActivation = toDismissPopupsOnActivation,
+            toUseBackgroundStriping = toUseBackgroundStriping,
+            overlays = overlays,
+            contentLayoutInfo = contentLayoutInfo
+        )
     }
 
     popupContentWindow.invalidate()