Merge branch 'master' into custom-element

Author: ricardo-devis-agullo

.github/workflows/node.js.yml

@@ -5,28 +5,27 @@ name: Node.js CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        node-version: [20.x, 20.x, 22.x]
+        node-version: [20.x, 22.x, 24.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
-    - uses: actions/checkout@v4
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v4
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'npm'
-    - run: npm ci
-    - run: npx playwright install --with-deps
-    - run: npm run build --if-present
-    - run: npm test
+      - uses: actions/checkout@v4
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'npm'
+      - run: npm ci
+      - run: npx playwright install --with-deps
+      - run: npm run build --if-present
+      - run: npm test

src/oc-client.js

@@ -521,41 +521,48 @@ export function createOc(oc) {
 			let isRendering = dataRendering == "true";
 			let isRendered = dataRendered == "true";
 
-			if (!isRendering && !isRendered) {
-				logInfo(MESSAGES_RETRIEVING);
-				setAttribute(dataRenderingAttribute, true);
-				if (!DISABLE_LOADER) {
-					component.innerHTML =
-						'<div class="oc-loading">' + MESSAGES_LOADING_COMPONENT + "</div>";
-				}
+			if (isRendered) {
+				callback();
+				return;
+			}
+			if (isRendering) {
+				timeout(() => {
+					oc.renderNestedComponent(component, callback);
+				}, POLLING_INTERVAL);
+				return;
+			}
 
-				oc.renderByHref(
-					{
-						href: getAttribute("href"),
-						id: getAttribute("id"),
-						element: component,
-					},
-					(err, data) => {
-						if (err || !data) {
-							setAttribute(dataRenderingAttribute, false);
-							setAttribute(dataRenderedAttribute, false);
-							setAttribute("data-failed", true);
-							component.innerHTML = "";
-							oc.events.fire("oc:failed", {
-								originalError: err,
-								data: data,
-								component,
-							});
-							logError(err);
-							callback();
-						} else {
-							processHtml(component, data, callback);
-						}
-					},
-				);
-			} else {
-				timeout(callback, POLLING_INTERVAL);
+			logInfo(MESSAGES_RETRIEVING);
+			setAttribute(dataRenderingAttribute, true);
+			if (!DISABLE_LOADER) {
+				component.innerHTML =
+					'<div class="oc-loading">' + MESSAGES_LOADING_COMPONENT + "</div>";
 			}
+
+			oc.renderByHref(
+				{
+					href: getAttribute("href"),
+					id: getAttribute("id"),
+					element: component,
+				},
+				(err, data) => {
+					if (err || !data) {
+						setAttribute(dataRenderingAttribute, false);
+						setAttribute(dataRenderedAttribute, false);
+						setAttribute("data-failed", true);
+						component.innerHTML = "";
+						oc.events.fire("oc:failed", {
+							originalError: err,
+							data: data,
+							component,
+						});
+						logError(err);
+						callback();
+					} else {
+						processHtml(component, data, callback);
+					}
+				},
+			);
 		});
 	};