This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new a75230b jewel-CollapsibleNavigationSectionRenderer: Add styling to
options with no submenu through a new "no-submenu" style
a75230b is described below
commit a75230b62bf5af2fb089aeb436f70e426e95f82a
Author: Carlos Rovira <[email protected]>
AuthorDate: Sat May 16 12:13:36 2020 +0200
jewel-CollapsibleNavigationSectionRenderer: Add styling to options with no
submenu through a new "no-submenu" style
---
.../royale/itemRenderers/NavigationGroupExampleItemRenderer.mxml | 5 ++---
.../jewel/itemRenderers/CollapsibleNavigationSectionRenderer.as | 1 +
frameworks/projects/Jewel/src/main/sass/components/_navigation.sass | 2 ++
frameworks/themes/JewelTheme/src/main/resources/defaults.css | 4 ++++
.../JewelTheme/src/main/sass/components-primary/_navigation.sass | 5 +++++
5 files changed, 14 insertions(+), 3 deletions(-)
diff --git
a/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/NavigationGroupExampleItemRenderer.mxml
b/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/NavigationGroupExampleItemRenderer.mxml
index 3ea5289..e465f0b 100644
---
a/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/NavigationGroupExampleItemRenderer.mxml
+++
b/examples/jewel/TourDeJewel/src/main/royale/itemRenderers/NavigationGroupExampleItemRenderer.mxml
@@ -21,7 +21,6 @@ limitations under the License.
xmlns:j="library://ns.apache.org/royale/jewel"
xmlns:js="library://ns.apache.org/royale/basic"
xmlns:html="library://ns.apache.org/royale/html"
-
sectionClick="handleNavToggle(event)"
minHeight="48">
<!-- using 'minHeight' instead of
'height' here since collapsible changes heigth of the renderer -->
@@ -69,8 +68,8 @@ limitations under the License.
var parentNav:Navigation = this.itemRendererOwnerView ?
this.itemRendererOwnerView.host as Navigation : null;
if (parentNav) {
//this hierarchy support is a bit kooky, and probably there
will be something better later with Hierarchical data setup
- navlink.selectedChild =selectedItem as NavigationLinkVO;
- if (parentNav.selectedItem!= this.data){
+ navlink.selectedChild = selectedItem as NavigationLinkVO;
+ if (parentNav.selectedItem != this.data) {
parentNav.selectedItem = this.data;
}
parentNav.dispatchEvent(new Event('change'));
diff --git
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/CollapsibleNavigationSectionRenderer.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/CollapsibleNavigationSectionRenderer.as
index d513935..b203992 100644
---
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/CollapsibleNavigationSectionRenderer.as
+++
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/CollapsibleNavigationSectionRenderer.as
@@ -239,6 +239,7 @@ package org.apache.royale.jewel.itemRenderers
} else {
children = null;
processChildren();
+ addClass("no-submenu");
}
//super.data dispatches the dataChange
diff --git
a/frameworks/projects/Jewel/src/main/sass/components/_navigation.sass
b/frameworks/projects/Jewel/src/main/sass/components/_navigation.sass
index 3641081..33256e3 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_navigation.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_navigation.sass
@@ -49,6 +49,8 @@ j|NavigationLinkItemRenderer
// Jewel CollapsibleNavigationSectionRenderer
.jewel.navigationgroup
+ &.no-submenu
+
j|CollapsibleNavigationSectionRenderer
IBeadController:
ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController")
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index faed5ec..dd8320c 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -887,6 +887,10 @@ j|FormItem {
margin-left: auto;
}
+.jewel.navigationgroup.no-submenu.hovered {
+ background: #f3f3f3 !important;
+}
+
.navigation-section-group {
transition: height 0.5s;
overflow: hidden !important;
diff --git
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_navigation.sass
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_navigation.sass
index 221db4c..781fbb6 100644
---
a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_navigation.sass
+++
b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_navigation.sass
@@ -55,6 +55,11 @@ $navigation-itemrenderer-padding: 16px
&.fonticon
margin-left: auto
+.jewel.navigationgroup
+ &.no-submenu
+ &.hovered
+ background: lighten($default-color, 10%) !important
+
.navigation-section-group
transition: height .5s
overflow: hidden !important
