From 099cda2bc8d9cce018da13e7fa2a3cb89269f0e2 Mon Sep 17 00:00:00 2001
From: dmendez <dmendez@genexus.com>
Date: Fri, 29 Jul 2022 10:14:46 -0300
Subject: [PATCH 1/3] issue97157 css layer support

---
 java/src/main/java/com/genexus/internet/HttpContext.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/src/main/java/com/genexus/internet/HttpContext.java b/java/src/main/java/com/genexus/internet/HttpContext.java
index b6172237c..e6f2c8c96 100644
--- a/java/src/main/java/com/genexus/internet/HttpContext.java
+++ b/java/src/main/java/com/genexus/internet/HttpContext.java
@@ -520,13 +520,15 @@ private void AddStyleSheetFile(String styleSheet, String urlBuildNumber, boolean
 		if (!styleSheets.contains(styleSheet))
 		{
 			styleSheets.add(styleSheet);
+			String sUncachedURL = oldConvertURL(styleSheet) + urlBuildNumber;
+			String sLayerName = styleSheet.replace("/", "_").replace(".","_");
 			if (!this.getHtmlHeaderClosed() && this.isEnabled)
 			{
 				String sRelAtt = (isDeferred ? "rel=\"preload\" as=\"style\" " : "rel=\"stylesheet\"");
 				if (isGxThemeHidden)
-					writeTextNL("<link id=\"gxtheme_css_reference\" " + sRelAtt + " type=\"text/css\" href=\"" + oldConvertURL(styleSheet) + urlBuildNumber + "\" " + htmlEndTag(HTMLElement.LINK));
+					writeTextNL("<link id=\"gxtheme_css_reference\" " + sRelAtt + " type=\"text/css\" href=\"" + sUncachedURL + "\" " + htmlEndTag(HTMLElement.LINK));
 				else
-					writeTextNL("<link " + sRelAtt + " type=\"text/css\" href=\"" + oldConvertURL(styleSheet) + urlBuildNumber + "\" " + htmlEndTag(HTMLElement.LINK));						
+					writeTextNL("<style data-gx-href=\""+ sUncachedURL + "\"> @import url(\"" + sUncachedURL + "\") layer(" + sLayerName + ") </style>");
 			}
 			else
 			{

From 048fa90757727223c8f85d17c85ad6b9a257d809 Mon Sep 17 00:00:00 2001
From: dmendez <dmendez@genexus.com>
Date: Mon, 22 Aug 2022 15:27:47 -0300
Subject: [PATCH 2/3] CloseStyles methos for correct css references ordering

---
 .../com/genexus/internet/HttpContext.java     | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/java/src/main/java/com/genexus/internet/HttpContext.java b/java/src/main/java/com/genexus/internet/HttpContext.java
index e6f2c8c96..264408a58 100644
--- a/java/src/main/java/com/genexus/internet/HttpContext.java
+++ b/java/src/main/java/com/genexus/internet/HttpContext.java
@@ -164,6 +164,10 @@ public void ajax_sending_grid_row(com.genexus.webpanels.GXWebRow row)
 
 	private static HashMap<String, Messages> cachedMessages = new HashMap<String, Messages>();
 	private String currentLanguage = null;
+	private Vector<Object> userStyleSheetFiles = new Vector<Object>();
+	private String ThemekbPrefix;
+	private String ThemestyleSheet;
+	private String ThemeurlBuildNumber;
 
 	private boolean isServiceWorkerDefined()
 	{
@@ -457,7 +461,7 @@ private String FetchCustomCSS()
 		return cssContent;
 	}
 
-	public void AddThemeStyleSheetFile(String kbPrefix, String styleSheet, String urlBuildNumber)
+	public void CloseStyles()
 	{
 		String cssContent = FetchCustomCSS();
 		boolean bHasCustomContent = ! cssContent.isEmpty();
@@ -466,7 +470,7 @@ public void AddThemeStyleSheetFile(String kbPrefix, String styleSheet, String ur
 			writeTextNL("<style id=\"gx-inline-css\">" + cssContent + "</style>");
 			styleSheets.add(getRequest().getServletPath());
 		}
-		String[] referencedFiles = ThemeHelper.getThemeCssReferencedFiles(PrivateUtilities.removeExtension(styleSheet));
+		String[] referencedFiles = ThemeHelper.getThemeCssReferencedFiles(PrivateUtilities.removeExtension(ThemestyleSheet));
 		for (int i=0; i<referencedFiles.length; i++)
 		{
 			String file = referencedFiles[i];
@@ -474,18 +478,29 @@ public void AddThemeStyleSheetFile(String kbPrefix, String styleSheet, String ur
 			if (extension != null)
 			{
 				if (extension.equals("css"))
-					AddStyleSheetFile(file, urlBuildNumber, false, bHasCustomContent);
+					AddStyleSheetFile(file, ThemeurlBuildNumber, false, bHasCustomContent);
 				else if (extension.equals("js"))
-					AddDeferredJavascriptSource(file, urlBuildNumber);
+					AddDeferredJavascriptSource(file, ThemeurlBuildNumber);
 			}
 		}
-		AddStyleSheetFile(kbPrefix + "Resources/" + getLanguage() + "/" + styleSheet, urlBuildNumber, true, bHasCustomContent);
+		for (Object data : this.userStyleSheetFiles)
+		{
+			String[] sdata = (String[]) data;
+			AddStyleSheetFile(sdata[0], sdata[1], false, false);
+		}
+		AddStyleSheetFile(ThemekbPrefix + "Resources/" + getLanguage() + "/" + ThemestyleSheet, ThemeurlBuildNumber, true, bHasCustomContent);
 	}
 	
 	public void AddThemeStyleSheetFile(String kbPrefix, String styleSheet)
 	{
 		AddThemeStyleSheetFile(kbPrefix, styleSheet, "");
 	}
+	public void AddThemeStyleSheetFile(String kbPrefix, String styleSheet, String urlBuildNumber)
+	{
+		this.ThemekbPrefix = kbPrefix;
+		this.ThemestyleSheet = styleSheet;
+		this.ThemeurlBuildNumber = urlBuildNumber;
+	}
 
 	public void AddStyleSheetFile(String styleSheet)
 	{
@@ -495,7 +510,7 @@ public void AddStyleSheetFile(String styleSheet)
 	public void AddStyleSheetFile(String styleSheet, String urlBuildNumber)
 	{
 		urlBuildNumber = getURLBuildNumber(styleSheet, urlBuildNumber);
-		AddStyleSheetFile(styleSheet, urlBuildNumber, false);
+		userStyleSheetFiles.add(new String[] { styleSheet, urlBuildNumber });
 	}
 
 	private String getURLBuildNumber(String resourcePath, String urlBuildNumber)

From e4ad5c6c5c00758bdd1157936b8f1778f20f99a9 Mon Sep 17 00:00:00 2001
From: dmendez <dmendez@genexus.com>
Date: Wed, 31 Aug 2022 14:34:38 -0300
Subject: [PATCH 3/3] java naming style

---
 .../com/genexus/internet/HttpContext.java     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/java/src/main/java/com/genexus/internet/HttpContext.java b/java/src/main/java/com/genexus/internet/HttpContext.java
index 264408a58..8525d6ed7 100644
--- a/java/src/main/java/com/genexus/internet/HttpContext.java
+++ b/java/src/main/java/com/genexus/internet/HttpContext.java
@@ -165,9 +165,9 @@ public void ajax_sending_grid_row(com.genexus.webpanels.GXWebRow row)
 	private static HashMap<String, Messages> cachedMessages = new HashMap<String, Messages>();
 	private String currentLanguage = null;
 	private Vector<Object> userStyleSheetFiles = new Vector<Object>();
-	private String ThemekbPrefix;
-	private String ThemestyleSheet;
-	private String ThemeurlBuildNumber;
+	private String themekbPrefix;
+	private String themestyleSheet;
+	private String themeurlBuildNumber;
 
 	private boolean isServiceWorkerDefined()
 	{
@@ -470,7 +470,7 @@ public void CloseStyles()
 			writeTextNL("<style id=\"gx-inline-css\">" + cssContent + "</style>");
 			styleSheets.add(getRequest().getServletPath());
 		}
-		String[] referencedFiles = ThemeHelper.getThemeCssReferencedFiles(PrivateUtilities.removeExtension(ThemestyleSheet));
+		String[] referencedFiles = ThemeHelper.getThemeCssReferencedFiles(PrivateUtilities.removeExtension(themestyleSheet));
 		for (int i=0; i<referencedFiles.length; i++)
 		{
 			String file = referencedFiles[i];
@@ -478,9 +478,9 @@ public void CloseStyles()
 			if (extension != null)
 			{
 				if (extension.equals("css"))
-					AddStyleSheetFile(file, ThemeurlBuildNumber, false, bHasCustomContent);
+					AddStyleSheetFile(file, themeurlBuildNumber, false, bHasCustomContent);
 				else if (extension.equals("js"))
-					AddDeferredJavascriptSource(file, ThemeurlBuildNumber);
+					AddDeferredJavascriptSource(file, themeurlBuildNumber);
 			}
 		}
 		for (Object data : this.userStyleSheetFiles)
@@ -488,7 +488,7 @@ else if (extension.equals("js"))
 			String[] sdata = (String[]) data;
 			AddStyleSheetFile(sdata[0], sdata[1], false, false);
 		}
-		AddStyleSheetFile(ThemekbPrefix + "Resources/" + getLanguage() + "/" + ThemestyleSheet, ThemeurlBuildNumber, true, bHasCustomContent);
+		AddStyleSheetFile(themekbPrefix + "Resources/" + getLanguage() + "/" + themestyleSheet, themeurlBuildNumber, true, bHasCustomContent);
 	}
 	
 	public void AddThemeStyleSheetFile(String kbPrefix, String styleSheet)
@@ -497,9 +497,9 @@ public void AddThemeStyleSheetFile(String kbPrefix, String styleSheet)
 	}
 	public void AddThemeStyleSheetFile(String kbPrefix, String styleSheet, String urlBuildNumber)
 	{
-		this.ThemekbPrefix = kbPrefix;
-		this.ThemestyleSheet = styleSheet;
-		this.ThemeurlBuildNumber = urlBuildNumber;
+		this.themekbPrefix = kbPrefix;
+		this.themestyleSheet = styleSheet;
+		this.themeurlBuildNumber = urlBuildNumber;
 	}
 
 	public void AddStyleSheetFile(String styleSheet)