QmlDesigner: Prepare States Editor for States not in the root node

Change-Id: I612de64447f04a041aa20b1ebc02c7fb6049eb03
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>

3 files changed, 38 insertions, 17 deletions

diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp
index 2d96d01a9dc..0d8d39936bd 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp
@@ -65,7 +65,7 @@ QModelIndex StatesEditorModel::index(int row, int column, const QModelIndex &par
 
     int internalNodeId = 0;
     if (row > 0 && row < rowCount() - 1) // first and last rows are base state, add state
-        internalNodeId = m_statesEditorView->rootModelNode().nodeListProperty("states").at(row - 1).internalId();
+        internalNodeId = m_statesEditorView->acitveStatesGroupNode().nodeListProperty("states").at(row - 1).internalId();
 
     return hasIndex(row, column, parent) ? createIndex(row, column,  internalNodeId) : QModelIndex();
 }
@@ -75,10 +75,10 @@ int StatesEditorModel::rowCount(const QModelIndex &parent) const
     if (parent.isValid() || m_statesEditorView.isNull() || !m_statesEditorView->model())
         return 0;
 
-    if (!m_statesEditorView->rootModelNode().hasNodeListProperty("states"))
+    if (!m_statesEditorView->acitveStatesGroupNode().hasNodeListProperty("states"))
         return 2; // base state + add new state
 
-    return m_statesEditorView->rootModelNode().nodeListProperty("states").count() + 2; // 2 = base state + add new state
+    return m_statesEditorView->acitveStatesGroupNode().nodeListProperty("states").count() + 2; // 2 = base state + add new state
 }
 
 void StatesEditorModel::reset()
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
index e9de5defb29..eefde504948 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
@@ -85,6 +85,20 @@ void StatesEditorView::rootNodeTypeChanged(const QString &/*type*/, int /*majorV
     checkForStatesAvailability();
 }
 
+ModelNode StatesEditorView::acitveStatesGroupNode() const
+{
+    return m_activeStatesGroupNode;
+}
+
+void StatesEditorView::setAcitveStatesGroupNode(const ModelNode &modelNode)
+{
+    if (m_activeStatesGroupNode == modelNode)
+        return;
+
+    m_activeStatesGroupNode = modelNode;
+    resetModel();
+}
+
 void StatesEditorView::removeState(int nodeId)
 {
     try {
@@ -193,12 +207,12 @@ void StatesEditorView::createNewState()
 void StatesEditorView::addState()
 {
     // can happen when root node is e.g. a ListModel
-    if (!QmlVisualNode::isValidQmlVisualNode(rootModelNode()))
+    if (!QmlVisualNode::isValidQmlVisualNode(acitveStatesGroupNode()))
         return;
 
     QmlDesignerPlugin::emitUsageStatistics(Constants::EVENT_STATE_ADDED);
 
-    QStringList modelStateNames = rootStateGroup().names();
+    QStringList modelStateNames = activeStateGroup().names();
 
     QString newStateName;
     int index = 1;
@@ -209,9 +223,9 @@ void StatesEditorView::addState()
     }
 
     executeInTransaction("addState", [this, newStateName]() {
-        rootModelNode().validId();
+        acitveStatesGroupNode().validId();
 
-        ModelNode newState = rootStateGroup().addState(newStateName);
+        ModelNode newState = activeStateGroup().addState(newStateName);
         setCurrentState(newState);
     });
 }
@@ -244,7 +258,7 @@ void StatesEditorView::duplicateCurrentState()
         newName = newName.left(match.capturedStart());
 
     int i = 1;
-    QStringList stateNames = rootStateGroup().names();
+    QStringList stateNames = activeStateGroup().names();
     while (stateNames.contains(newName + QString::number(i)))
         i++;
     const QString newStateName = newName + QString::number(i);
@@ -258,7 +272,7 @@ void StatesEditorView::duplicateCurrentState()
 void StatesEditorView::checkForStatesAvailability()
 {
     if (m_statesEditorWidget) {
-        const bool isVisual = QmlVisualNode::isValidQmlVisualNode(rootModelNode());
+        const bool isVisual = QmlVisualNode::isValidQmlVisualNode(acitveStatesGroupNode());
         m_statesEditorWidget->showAddNewStatesButton(isVisual);
     }
 }
@@ -277,16 +291,16 @@ QmlModelState StatesEditorView::baseState() const
     return QmlModelState::createBaseState(this);
 }
 
-QmlModelStateGroup StatesEditorView::rootStateGroup() const
+QmlModelStateGroup StatesEditorView::activeStateGroup() const
 {
-    return QmlModelStateGroup(rootModelNode());
+    return QmlModelStateGroup(acitveStatesGroupNode());
 }
 
 bool StatesEditorView::validStateName(const QString &name) const
 {
     if (name == tr("base state"))
         return false;
-    const QList<QmlModelState> modelStates = rootStateGroup().allStates();
+    const QList<QmlModelState> modelStates = activeStateGroup().allStates();
     for (const QmlModelState &state : modelStates) {
         if (state.name() == name)
             return false;
@@ -392,8 +406,8 @@ void StatesEditorView::resetDefaultState()
     auto guard = qScopeGuard([&]() { m_block = false; });
 
     try {
-        if (rootModelNode().hasProperty("state"))
-            rootModelNode().removeProperty("state");
+        if (acitveStatesGroupNode().hasProperty("state"))
+            acitveStatesGroupNode().removeProperty("state");
 
     } catch (const RewritingException &e) {
         e.showException();
@@ -402,7 +416,7 @@ void StatesEditorView::resetDefaultState()
 
 bool StatesEditorView::hasDefaultState() const
 {
-    return rootModelNode().hasProperty("state");
+    return acitveStatesGroupNode().hasProperty("state");
 }
 
 void StatesEditorView::setAnnotation(int internalNodeId)
@@ -475,6 +489,8 @@ void StatesEditorView::modelAttached(Model *model)
     Q_ASSERT(model);
     AbstractView::modelAttached(model);
 
+    m_activeStatesGroupNode = rootModelNode();
+
     if (m_statesEditorWidget)
         m_statesEditorWidget->setNodeInstanceView(nodeInstanceView());
 
@@ -593,7 +609,7 @@ void StatesEditorView::instancesPreviewImageChanged(const QVector<ModelNode> &no
             minimumIndex = qMin(minimumIndex, 0);
             maximumIndex = qMax(maximumIndex, 0);
         } else {
-            int index = rootStateGroup().allStates().indexOf(QmlModelState(node)) + 1;
+            int index = activeStateGroup().allStates().indexOf(QmlModelState(node)) + 1;
             if (index > 0) {
                 minimumIndex = qMin(minimumIndex, index);
                 maximumIndex = qMax(maximumIndex, index);
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h
index 71a82711eaa..1ee8144a2bb 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h
@@ -55,7 +55,7 @@ public:
     QString currentStateName() const;
     void setCurrentState(const QmlModelState &state);
     QmlModelState baseState() const;
-    QmlModelStateGroup rootStateGroup() const;
+    QmlModelStateGroup activeStateGroup() const;
 
     // AbstractView
     void modelAttached(Model *model) override;
@@ -87,6 +87,10 @@ public:
 
     void rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) override;
 
+    ModelNode acitveStatesGroupNode() const;
+    void setAcitveStatesGroupNode(const ModelNode &modelNode);
+
+
 public slots:
     void synchonizeCurrentStateFromWidget();
     void createNewState();
@@ -105,6 +109,7 @@ private:
     int m_lastIndex;
     bool m_block = false;
     QPointer<AnnotationEditor> m_editor;
+    ModelNode m_activeStatesGroupNode;
 };
 
 } // namespace QmlDesigner