fix(react): wrong settings order

p3ol · Nov 22, 2023 · 13ac8c4 · 13ac8c4
1 parent 0720afb
commit 13ac8c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/packages/core/lib/Builder/index.js b/packages/core/lib/Builder/index.js
@@ -134,9 +134,9 @@ export default class Builder extends Emitter {
 
   getComponentDisplayableSettings (element, { component }) {
     return [
-      ...this.#settings.getDisplayable?.(element) || [],
       ...this.#components
         .getDisplayableSettings?.(element, { component }) || [],
+      ...this.#settings.getDisplayable?.(element) || [],
     ];
   }
 

diff --git a/packages/react/lib/Editable/Form.js b/packages/react/lib/Editable/Form.js
@@ -105,13 +105,10 @@ const Form = ({
           .map((tab, t) => (
             <Tab key={tab.id || t} title={<Text>{ tab.title }</Text>}>
               <div className="fields oak-flex oak-flex-col oak-gap-4">
-                { tab
-                  .fields
-                  .concat(
-                    (component.settings?.fields || [])
-                      .filter(field => (tab.id === 'general' && !field.tab) ||
-                        field.tab === tab.id)
-                  )
+                { (component.settings?.fields || [])
+                  .filter(field => (tab.id === 'general' && !field.tab) ||
+                    field.tab === tab.id)
+                  .concat(tab.fields)
                   .sort((a, b) => getFieldPriority(b) - getFieldPriority(a))
                   .filter(f =>
                     !f.condition ||