Merge pull request #255 from aleevas/DS-1657

feat: [DS-1657] Extend override libraries for WS override plugin
YCloudYUSA · Nov 12, 2024 · 5a43dea · 5a43dea
2 parents ae385db + 629a9a5
commit 5a43dea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/WSOverrideLayoutBuilder.php b/src/WSOverrideLayoutBuilder.php
@@ -134,7 +134,7 @@ private function getSelectedColorway(EntityInterface $entity): string {
     $stored_ws_styles = $entity?->override_styles?->value
       ? unserialize($entity?->styles?->value)
       : $this->getDefaultWsStyle($entity->bundle());
-    return $stored_ws_styles['colorway'];
+    return $stored_ws_styles['colorway'] ?? '';
   }
 
   /**

diff --git a/y_lb.module b/y_lb.module
@@ -261,6 +261,10 @@ function y_lb_preprocess_block(&$variables) {
   // Override library via override plugin.
   if ($libraries = _y_lb_get_override_component_library($variables['plugin_id'])) {
     $variables['#attached']['library'] = $libraries;
+    // In case custom block with add library in the content area.
+    if (isset($variables['content']['#attached'])) {
+      $variables['content']['#attached']['library'][] = $libraries[0];
+    }
   }
 }