This is an automated email from the ASF dual-hosted git repository.
Harbs 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 a25a6c5183 More permissive handling of "flex" values
a25a6c5183 is described below
commit a25a6c5183fa176bcd694c6212db17e4be403dc8
Author: Harbs <[email protected]>
AuthorDate: Sun Jun 14 22:02:51 2026 +0300
More permissive handling of "flex" values
---
.../style/stylebeads/flexgrid/AlignContent.as | 35 +++++++++++++++++++---
.../royale/style/stylebeads/flexgrid/AlignItems.as | 6 +++-
.../royale/style/stylebeads/flexgrid/AlignSelf.as | 6 +++-
.../style/stylebeads/flexgrid/JustifyContent.as | 6 +++-
4 files changed, 46 insertions(+), 7 deletions(-)
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/flexgrid/AlignContent.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/flexgrid/AlignContent.as
index 67d76afb45..99c2b8ec7e 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/flexgrid/AlignContent.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/flexgrid/AlignContent.as
@@ -40,16 +40,43 @@ package org.apache.royale.style.stylebeads.flexgrid
}
return [value];
}
+ private function
normalizeDistributedKeyword(value:String):String
+ {
+ switch(value)
+ {
+ case "between":
+ return "space-between";
+ case "around":
+ return "space-around";
+ case "evenly":
+ return "space-evenly";
+ }
+ return value;
+ }
+ private function
normalizeDistributedSelector(value:String):String
+ {
+ switch(value)
+ {
+ case "space-between":
+ return "between";
+ case "space-around":
+ return "around";
+ case "space-evenly":
+ return "evenly";
+ }
+ return getAfterDash(value);
+ }
+ [Inspectable(category="General",
enumeration="normal,center,safe center,start,end,safe
end,flex-start,flex-end,safe flex-end,between,around,evenly,baseline,stretch",
defaultValue="normal")]
override public function set value(value:*):void
{
- assert(["normal","flex-start","flex-end","safe
flex-end","flex-end safe","center","safe center","center safe","baseline","last
baseline","stretch"].indexOf(value) >= 0, "Invalid value for align-items: " +
value);
+ assert(["normal","center","safe center","center
safe","start","end","safe end","end safe","flex-start","flex-end","safe
flex-end","flex-end
safe","between","around","evenly","space-between","space-around","space-evenly","baseline","stretch"].indexOf(value)
>= 0, "Invalid value for align-content: " + value);
_value = value;
var vals:Array = normalizeSafeKeyword(value);
- calculatedRuleValue = vals[0];
- calculatedSelector = getAfterDash(vals[0]);
+ calculatedRuleValue =
normalizeDistributedKeyword(vals[0]);
+ calculatedSelector =
normalizeDistributedSelector(vals[0]);
if(vals.length > 1)
{
- calculatedRuleValue = vals[1] + " " + vals[0];
+ calculatedRuleValue = vals[1] + " " +
normalizeDistributedKeyword(vals[0]);
calculatedSelector += "-" + vals[1];
}
}
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/flexgrid/AlignItems.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/flexgrid/AlignItems.as
index c39570f0ad..29b18dd000 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/flexgrid/AlignItems.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/flexgrid/AlignItems.as
@@ -35,17 +35,21 @@ package org.apache.royale.style.stylebeads.flexgrid
if (value.indexOf("safe") >= 0)
{
value = value.replace("safe",
"").trim();
+ if(value == "start" || value == "end")
+ value = "flex-" + value;
return [value,"safe"];
}
}
+ if(value == "start" || value == "end")
+ value = "flex-" + value;
return [value];
}
override public function set value(value:*):void
{
- assert(["flex-start","flex-end","safe
flex-end","flex-end safe","center","safe center","center safe","baseline","last
baseline","stretch"].indexOf(value) >= 0, "Invalid value for align-items: " +
value);
_value = value;
var vals:Array = normalizeSafeKeyword(value);
calculatedRuleValue = vals[0];
+
assert(["flex-start","flex-end","center","baseline","last
baseline","stretch"].indexOf(vals[0]) >= 0, "Invalid value for align-items: " +
value);
calculatedSelector = getAfterDash(vals[0]);
if(vals.length > 1)
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/flexgrid/AlignSelf.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/flexgrid/AlignSelf.as
index 1787873677..e04f4ce2fd 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/flexgrid/AlignSelf.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/flexgrid/AlignSelf.as
@@ -35,18 +35,22 @@ package org.apache.royale.style.stylebeads.flexgrid
if (value.indexOf("safe") >= 0)
{
value = value.replace("safe",
"").trim();
+ if(value == "start" || value == "end")
+ value = "flex-" + value;
return [value,"safe"];
}
}
+ if(value == "start" || value == "end")
+ value = "flex-" + value;
return [value];
}
[Inspectable(category="General",
enumeration="auto,flex-start,flex-end,center,safe center,safe
flex-end,stretch,baseline,last baseline", defaultValue="")]
override public function set value(value:*):void
{
- assert(["auto","flex-start","flex-end","safe
flex-end","flex-end safe","center","safe center","center safe","baseline","last
baseline","stretch"].indexOf(value) >= 0, "Invalid value for align-self: " +
value);
_value = value;
var vals:Array = normalizeSafeKeyword(value);
calculatedRuleValue = vals[0];
+
assert(["auto","flex-start","flex-end","center","baseline","last
baseline","stretch"].indexOf(vals[0]) >= 0, "Invalid value for align-self: " +
value);
calculatedSelector = getAfterDash(vals[0]);
if(vals.length > 1)
{
diff --git
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/flexgrid/JustifyContent.as
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/flexgrid/JustifyContent.as
index 64404907b6..7fdaeb6f6a 100644
---
a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/flexgrid/JustifyContent.as
+++
b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/flexgrid/JustifyContent.as
@@ -35,18 +35,22 @@ package org.apache.royale.style.stylebeads.flexgrid
if (value.indexOf("safe") >= 0)
{
value = value.replace("safe",
"").trim();
+ if(value == "start" || value == "end")
+ value = "flex-" + value;
return [value,"safe"];
}
}
+ if(value == "start" || value == "end")
+ value = "flex-" + value;
return [value];
}
[Inspectable(category="General", enumeration="center,safe
center,start,end,safe
end,space-between,space-around,space-evenly,baseline,stretch,normal",
defaultValue="normal")]
override public function set value(value:*):void
{
- assert(["center","center safe","safe
center","start","end","end safe","safe
end","space-between","space-around","space-evenly","baseline","stretch","normal"].indexOf(value)
>= 0, "Invalid value for place-content: " + value);
_value = value;
var vals:Array = normalizeSafeKeyword(value);
calculatedRuleValue = vals[0];
+
assert(["center","flex-start","flex-end","space-between","space-around","space-evenly","baseline","stretch","normal"].indexOf(vals[0])
>= 0, "Invalid value for place-content: " + value);
calculatedSelector = getAfterDash(vals[0]);
if(vals.length > 1)
{
