fix(ui): top-navigation center align

akveo · Apr 13, 2019 · a01cbd1 · a01cbd1
1 parent 7203d2b
commit a01cbd1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/src/framework/ui/package-lock.json b/src/framework/ui/package-lock.json
diff --git a/src/framework/ui/topNavigation/topNavigation.component.tsx b/src/framework/ui/topNavigation/topNavigation.component.tsx
@@ -145,8 +145,10 @@ const styles = StyleSheet.create({
   subtitle: {},
   leftControlContainer: {
     flexDirection: 'row',
+    zIndex: 1,
   },
   rightControlsContainer: {
     flexDirection: 'row',
+    zIndex: 1,
   },
 });
diff --git a/src/framework/ui/topNavigation/topNavigation.spec.tsx.snap b/src/framework/ui/topNavigation/topNavigation.spec.tsx.snap
@@ -393,6 +393,7 @@ exports[`@top-navigation-bar/action * bar/alignment: center 1`] = `
     style={
       Object {
         "flexDirection": "row",
+        "zIndex": 1,
       }
     }
   />
@@ -422,6 +423,7 @@ exports[`@top-navigation-bar/action * bar/alignment: center 1`] = `
     style={
       Object {
         "flexDirection": "row",
+        "zIndex": 1,
       }
     }
   />
@@ -553,6 +555,7 @@ exports[`@top-navigation-bar/action * bar/subtitle 1`] = `
     style={
       Object {
         "flexDirection": "row",
+        "zIndex": 1,
       }
     }
   />
@@ -594,6 +597,7 @@ exports[`@top-navigation-bar/action * bar/subtitle 1`] = `
     style={
       Object {
         "flexDirection": "row",
+        "zIndex": 1,
       }
     }
   />
@@ -725,6 +729,7 @@ exports[`@top-navigation-bar/action * bar/title 1`] = `
     style={
       Object {
         "flexDirection": "row",
+        "zIndex": 1,
       }
     }
   />
@@ -754,6 +759,7 @@ exports[`@top-navigation-bar/action * bar/title 1`] = `
     style={
       Object {
         "flexDirection": "row",
+        "zIndex": 1,
       }
     }
   />
@@ -885,6 +891,7 @@ exports[`@top-navigation-bar/action * bar/with actions 1`] = `
     style={
       Object {
         "flexDirection": "row",
+        "zIndex": 1,
       }
     }
   >
@@ -942,6 +949,7 @@ exports[`@top-navigation-bar/action * bar/with actions 1`] = `
     style={
       Object {
         "flexDirection": "row",
+        "zIndex": 1,
       }
     }
   >

diff --git a/src/framework/ui/topNavigation/type.ts b/src/framework/ui/topNavigation/type.ts
@@ -19,7 +19,7 @@ export class TopNavigationAlignments {
     margin(leftActionCount: number, rightActionCount: number, actionWidth: number): number {
       const diff: number = rightActionCount - leftActionCount;
 
-      return (rightActionCount - leftActionCount) * diff;
+      return actionWidth * diff;
     }
   };