Merge branch 'master' of https://github.com/prysmex/ember-eui

Author: patodevilla

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "5.0.0-alpha.6",
+  "version": "5.0.0",
   "packages": [
     "packages/*"
   ],

packages/changeset-form/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ember-eui/changeset-form",
-  "version": "5.0.0-alpha.6",
+  "version": "5.0.0",
   "description": "Ember Eui changeset integration",
   "keywords": [
     "ember-addon",
@@ -30,7 +30,7 @@
     "postpack": "ember ts:clean"
   },
   "dependencies": {
-    "@ember-eui/core": "^5.0.0-alpha.6",
+    "@ember-eui/core": "^5.0.0",
     "ember-changeset": "github:betocantu93/ember-changeset#v3.15.1",
     "ember-changeset-validations": "^3.16.0",
     "ember-cli-babel": "^7.26.11",

packages/core/addon/components/eui-page-body/index.hbs

@@ -1,63 +1,46 @@
 {{#let
-  (arg-or-default @tagName "div")
   (arg-or-default @restrictWidth false)
+  (arg-or-default @tagName "div")
   (arg-or-default @borderRadius "none")
   (arg-or-default @paddingSize (if @panelled "l" "none"))
-  as |tagName restrictWidth borderRadius paddingSize|
+  as |restrictWidth tagName borderRadius paddingSize|
 }}
 
-  {{#let
-    (if
-      (eq restrictWidth true)
-      (hash widthClassName="euiPageBody--restrictWidth-custom")
-      (if
-        (eq restrictWidth false)
-        (hash
-          widthClassName="euiPageBody--restrictWidth-default"
-          widthStyle=restrictWidth
-        )
-      )
-    )
-    as |styling|
-  }}
+  {{#let (eui-page-restrict-width restrictWidth @style) as |styling|}}
     {{#if @panelled}}
       <EuiPanel
         class={{class-names
+          (if (eq borderRadius "none") "euiPageBody--borderRadiusNone")
+          (if
+            styling.widthClassName
+            (concat "euiPageBody--" styling.widthClassName)
+          )
           componentName="EuiPageBody"
-          borderRadiusSize=borderRadius
           paddingSize=@paddingSize
         }}
         @paddingSize={{paddingSize}}
         @borderRadius={{borderRadius}}
-        {{!-- @paddingSize={{arg-or-default @paddingSize "none"}} --}}
-        {{!-- @restrictWidth={{@restrictWidth}} --}}
+        @color={{@color}}
+        @hasBorder={{@hasBorder}}
+        @hasShadow={{@hasShadow}}
+        {{style styling.newStyle}}
         ...attributes
-        {{style
-          (if styling.widthStyle (inline-styles max-width=styling.widthStyle))
-        }}
       >
-        {{!-- <div
-          class={{class-names
-            componentName="EuiPageBody"
-            borderRadiusSize=borderRadius
-            paddingSize=paddingSize
-          }}
-        > --}}
         {{yield}}
-        {{! </div> }}
       </EuiPanel>
     {{else}}
       {{#let (element tagName) as |Tag|}}
         <Tag
           class={{class-names
+            (if (eq borderRadius "none") "euiPageBody--borderRadiusNone")
+            (if
+              styling.widthClassName
+              (concat "euiPageBody--" styling.widthClassName)
+            )
             componentName="EuiPageBody"
-            borderRadiusSize=borderRadius
-            paddingSize=paddingSize
-          }}
-          style={{if
-            styling.widthStyle
-            (inline-styles max-width=styling.widthStyle)
+            paddingSize=@paddingSize
           }}
+          {{style styling.newStyle}}
           ...attributes
         >
           {{yield}}

packages/core/addon/components/eui-page-content-body/index.hbs

@@ -1,15 +1,16 @@
-<div
-  class={{class-names
-    (if
-      @restrictWidth
-      "euiPage--restrictWidth-custom"
-      "euiPage--restrictWidth-default"
-    )
-    componentName="EuiPageContentBody"
-    paddingSize=@paddingSize
-  }}
-  {{style (inline-styles width=@restrictWidth)}}
-  ...attributes
->
-  {{yield}}
-</div>
+{{#let
+  (eui-page-restrict-width (arg-or-default @restrictWidth false) @style)
+  as |styling|
+}}
+  <div
+    class={{class-names
+      (concat "euiPage--" styling.widthClassName)
+      componentName="EuiPageContentBody"
+      paddingSize=@paddingSize
+    }}
+    {{style styling.newStyle}}
+    ...attributes
+  >
+    {{yield}}
+  </div>
+{{/let}}

packages/core/addon/components/eui-page-content-header/index.hbs

@@ -2,20 +2,8 @@
   class={{class-names
     "euiPageContentHeader"
     (if @responsive "euiPageContentHeader--responsive")
-    (if
-      @restrictWidth
-      "euiPanel--restrictWidth-custom"
-      "euiPanel--restrictWidth-default"
-    )
   }}
-  {{style (inline-styles width=@restrictWidth)}}
   ...attributes
 >
-  {{yield
-    (hash
-      Section=(component
-        "eui-page-content-header-section"
-      )
-    )
-  }}
+  {{yield}}
 </div>

packages/core/addon/components/eui-page-content/index.hbs

@@ -1,17 +1,20 @@
-<EuiPanel
-  class={{class-names
-    componentName="EuiPageContent"
-    verticalPosition=@verticalPosition
-    horizontalPosition=@horizontalPosition
-    borderRadius=@borderRadius
-  }}
-  @hasShadow={{@hasShadow}}
-  @hasBorder={{@hasBorder}}
-  @paddingSize={{arg-or-default @paddingSize "l"}}
-  @borderRadius={{@borderRadius}}
-  @color={{@color}}
-  @grow={{@grow}}
-  ...attributes
->
-  {{yield}}
-</EuiPanel>
+{{#let (arg-or-default @role "main") as |role|}}
+  <EuiPanel
+    role={{if (eq role null) undefined role}}
+    class={{class-names
+      (if (eq @borderRadius "none") "euiPageContent--borderRadiusNone")
+      componentName="EuiPageContent"
+      verticalPosition=@verticalPosition
+      horizontalPosition=@horizontalPosition
+    }}
+    @hasShadow={{@hasShadow}}
+    @hasBorder={{@hasBorder}}
+    @paddingSize={{arg-or-default @paddingSize "l"}}
+    @borderRadius={{@borderRadius}}
+    @color={{@color}}
+    @grow={{@grow}}
+    ...attributes
+  >
+    {{yield}}
+  </EuiPanel>
+{{/let}}