example/qml/component/CodeExpander.qml

@@ -16,7 +16,7 @@ FluExpander{
         id:content
         width:parent.width
         text:highlightQmlCode(code)
-        textFormat: FluCopyableText.RichText
+        textFormat: FluMultilineTextBox.RichText
         padding: 10
         topPadding: 10
         leftPadding: 10

src/Qt5/imports/FluentUI/Controls/FluCopyableText.qml

@@ -26,24 +26,10 @@ TextEdit {
         anchors.fill: parent
         cursorShape: Qt.IBeamCursor
         acceptedButtons: Qt.RightButton
-        onClicked: control.echoMode !== TextInput.Password && menu_loader.popup()
+        onClicked: control.echoMode !== TextInput.Password && menu.popup()
     }
-    FluLoader{
+    FluTextBoxMenu{
-        id: menu_loader
-        function popup(){
-            sourceComponent = menu
-        }
-    }
-    Component{
         id:menu
-        FluTextBoxMenu{
+        inputItem: control
-            inputItem: control
-            Component.onCompleted: {
-                popup()
-            }
-            onClosed: {
-                menu_loader.sourceComponent = undefined
-            }
-        }
     }
 }

src/Qt5/imports/FluentUI/Controls/FluMultilineTextBox.qml

@@ -71,25 +71,11 @@ TextArea{
             if(control.readOnly && control.text === ""){
                 return
             }
-            menu_loader.popup()
+            menu.popup()
         }
     }
-    FluLoader{
+    FluTextBoxMenu{
-        id: menu_loader
-        function popup(){
-            sourceComponent = menu
-        }
-    }
-    Component{
         id:menu
-        FluTextBoxMenu{
+        inputItem: control
-            Component.onCompleted: {
-                popup()
-            }
-            inputItem: control
-            onClosed: {
-                menu_loader.sourceComponent = undefined
-            }
-        }
     }
 }

src/Qt5/imports/FluentUI/Controls/FluPasswordBox.qml

@@ -65,4 +65,8 @@ TextField{
             rightMargin: 5
         }
     }
+    FluTextBoxMenu{
+        id:menu
+        inputItem: control
+    }
 }

src/Qt5/imports/FluentUI/Controls/FluTextBox.qml

@@ -69,7 +69,7 @@ TextField{
             if(control.readOnly && control.text === ""){
                 return
             }
-            menu_loader.popup()
+            menu.popup()
         }
     }
     RowLayout{
@@ -111,22 +111,8 @@ TextField{
             visible: control.iconSource != 0
         }
     }
-    FluLoader{
+    FluTextBoxMenu{
-        id: menu_loader
-        function popup(){
-            sourceComponent = menu
-        }
-    }
-    Component{
         id:menu
-        FluTextBoxMenu{
+        inputItem: control
-            inputItem: control
-            Component.onCompleted: {
-                popup()
-            }
-            onClosed: {
-                menu_loader.sourceComponent = undefined
-            }
-        }
     }
 }

src/Qt6/imports/FluentUI/Controls/FluCopyableText.qml

@@ -26,24 +26,10 @@ TextEdit {
         anchors.fill: parent
         cursorShape: Qt.IBeamCursor
         acceptedButtons: Qt.RightButton
-        onClicked: control.echoMode !== TextInput.Password && menu_loader.popup()
+        onClicked: control.echoMode !== TextInput.Password && menu.popup()
     }
-    FluLoader{
+    FluTextBoxMenu{
-        id: menu_loader
-        function popup(){
-            sourceComponent = menu
-        }
-    }
-    Component{
         id:menu
-        FluTextBoxMenu{
+        inputItem: control
-            inputItem: control
-            Component.onCompleted: {
-                popup()
-            }
-            onClosed: {
-                menu_loader.sourceComponent = undefined
-            }
-        }
     }
 }

src/Qt6/imports/FluentUI/Controls/FluMultilineTextBox.qml

@@ -72,25 +72,11 @@ TextArea{
             if(control.readOnly && control.text === ""){
                 return
             }
-            menu_loader.popup()
+            menu.popup()
         }
     }
-    FluLoader{
+    FluTextBoxMenu{
-        id: menu_loader
-        function popup(){
-            sourceComponent = menu
-        }
-    }
-    Component{
         id:menu
-        FluTextBoxMenu{
+        inputItem: control
-            inputItem: control
-            Component.onCompleted: {
-                popup()
-            }
-            onClosed: {
-                menu_loader.sourceComponent = undefined
-            }
-        }
     }
 }

src/Qt6/imports/FluentUI/Controls/FluPasswordBox.qml

@@ -66,4 +66,8 @@ TextField{
             rightMargin: 5
         }
     }
+    FluTextBoxMenu{
+        id:menu
+        inputItem: control
+    }
 }

src/Qt6/imports/FluentUI/Controls/FluTextBox.qml

@@ -70,7 +70,7 @@ TextField{
             if(control.readOnly && control.text === ""){
                 return
             }
-            menu_loader.popup()
+            menu.popup()
         }
     }
     RowLayout{
@@ -112,22 +112,8 @@ TextField{
             visible: control.iconSource != 0
         }
     }
-    FluLoader{
+    FluTextBoxMenu{
-        id: menu_loader
-        function popup(){
-            sourceComponent = menu
-        }
-    }
-    Component{
         id:menu
-        FluTextBoxMenu{
+        inputItem: control
-            inputItem: control
-            Component.onCompleted: {
-                popup()
-            }
-            onClosed: {
-                menu_loader.sourceComponent = undefined
-            }
-        }
     }
 }

src/fluentui_en_US.ts

@@ -232,8 +232,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluShortcutPicker.qml" line="204"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluShortcutPicker.qml" line="205"/>
-        <location filename="Qt6/imports/FluentUI/Controls/FluShortcutPicker.qml" line="204"/>
         <source>Conflict</source>
         <translation type="unfinished"></translation>
     </message>
@@ -355,8 +354,8 @@
 <context>
     <name>FluWindow</name>
     <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="354"/>
+        <location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="347"/>
-        <location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="354"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="346"/>
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>

src/fluentui_zh_CN.ts

@@ -232,8 +232,7 @@
         <translation type="unfinished">重置</translation>
     </message>
     <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluShortcutPicker.qml" line="204"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluShortcutPicker.qml" line="205"/>
-        <location filename="Qt6/imports/FluentUI/Controls/FluShortcutPicker.qml" line="204"/>
         <source>Conflict</source>
         <translation type="unfinished">冲突</translation>
     </message>
@@ -355,8 +354,8 @@
 <context>
     <name>FluWindow</name>
     <message>
-        <location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="354"/>
+        <location filename="Qt5/imports/FluentUI/Controls/FluWindow.qml" line="347"/>
-        <location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="354"/>
+        <location filename="Qt6/imports/FluentUI/Controls/FluWindow.qml" line="346"/>
         <source>Loading...</source>
         <translation type="unfinished">加载中...</translation>
     </message>