Merge branch 'develop' into feature/CIVIC-2105

Author: febdao

package.json

@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "@civictheme/uikit": "github:civictheme/uikit#3505451--update-field-message-props"
+    "@civictheme/uikit": "github:civictheme/uikit#main"
   }
 }

web/themes/contrib/civictheme/civictheme.post_update.php

@@ -806,7 +806,60 @@ function civictheme_post_update_update_view_mode_civictheme_navigation_card_ref_
   if ($config_read) {
     $config_object = \Drupal::configFactory()->getEditable('core.entity_view_display.paragraph.civictheme_navigation_card_ref.default');
     $config_object->set('content.field_c_p_reference.settings.view_mode', 'civictheme_navigation_card');
-    $config_object->save();return (string) new TranslatableMarkup('Updated view mode from "civictheme_snippet" to "civictheme_navigation_card".');
+    $config_object->save();
+    return (string) new TranslatableMarkup('Updated view mode from "civictheme_snippet" to "civictheme_navigation_card".');
   }
   return (string) new TranslatableMarkup('No update needed for view mode.');
 }
+
+/**
+ * Add field_c_b_link_in_mobile_menu field config and update form view.
+ *
+ * @SuppressWarnings(PHPMD.StaticAccess)
+ */
+function civictheme_post_update_add_search_link_field_to_search_component(): string {
+  $block_field_configs = [
+    'field.storage.block_content.field_c_b_link_in_mobile_menu' => 'field_storage_config',
+    'field.field.block_content.civictheme_search.field_c_b_link_in_mobile_menu' => 'field_config',
+  ];
+
+  $config_path = \Drupal::service('extension.list.theme')->getPath('civictheme') . '/config/install';
+  \Drupal::classResolver(CivicthemeUpdateHelper::class)->createConfigs($block_field_configs, $config_path);
+
+  $new_form_config = [
+    'field_c_b_link_in_mobile_menu' => [
+      'type' => 'boolean_checkbox',
+      'weight' => 2,
+      'region' => 'content',
+      'settings' => [
+        'display_label' => TRUE,
+      ],
+    ],
+  ];
+
+  \Drupal::classResolver(CivicthemeUpdateHelper::class)->updateFormDisplayConfig('block_content', 'civictheme_search', $new_form_config);
+
+  return (string) new TranslatableMarkup('Added field_c_b_link_in_mobile_menu field config and updated form view.');
+}
+
+/**
+ * Update editor config for D11 requirement (remove duplicate settings).
+ */
+function civictheme_post_update_update_editor_allowed_field(): string {
+  $config_name = 'editor.editor.civictheme_rich_text';
+  $config_object = \Drupal::configFactory()->getEditable($config_name);
+
+  // Fetch the existing allowed tags.
+  $allowed_tags = $config_object->get('settings.plugins.ckeditor5_sourceEditing.allowed_tags');
+  if (is_array($allowed_tags)) {
+    $allowed_tags = array_filter($allowed_tags, function ($tag) {
+      return $tag !== '<a hreflang target title class="ct-content-link ct-content-link--external ct-button--button ct-theme-dark">';
+    });
+    $config_object->set('settings.plugins.ckeditor5_sourceEditing.allowed_tags', $allowed_tags);
+
+    // Update the configuration with the modified allowed tags.
+    $config_object->save();
+    return (string) new TranslatableMarkup('Updated editor allowed field.');
+  }
+  return (string) new TranslatableMarkup('Allowed tags setting not set, aborting update.');
+}

web/themes/contrib/civictheme/civictheme_starter_kit/civictheme_starter_kit.info.yml

@@ -2,7 +2,7 @@ name: CivicTheme Starter Kit
 type: theme
 base theme: civictheme
 description: 'CivicTheme Starter Kit description.'
-core_version_requirement: ^9 || ^10
+core_version_requirement: ^9 || ^10 || ^11
 hidden: true
 
 regions: