Merge branch 'develop' into feature/DIGITAL-99-robo-standards

Author: omerida

config/sync/core.entity_view_display.media.video.default.yml

@@ -14,7 +14,7 @@ mode: default
 content:
   field_media_oembed_video:
     type: oembed
-    label: visually_hidden
+    label: hidden
     settings:
       max_width: 0
       max_height: 0

config/sync/editor.editor.html.yml

@@ -16,7 +16,6 @@ settings:
       - code
       - link
       - heading
-      - blockQuote
       - bulletedList
       - numberedList
       - drupalMedia
@@ -50,10 +49,16 @@ settings:
         -
           label: 'USA button link (outlined)'
           element: '<a class="usa-button usa-button--outline">'
+        -
+          label: Checklist
+          element: '<ul class="dg-checklist">'
+        -
+          label: 'Checklist (no top border)'
+          element: '<ul class="dg-checklist dg-checklist--no-border">'
     linkit_extension:
       linkit_enabled: true
       linkit_profile: default
     media_media:
-      allow_view_mode_override: true
+      allow_view_mode_override: false
 image_upload:
   status: false

config/sync/editor.editor.html_embedded_content.yml

@@ -16,7 +16,6 @@ settings:
       - code
       - link
       - heading
-      - blockQuote
       - bulletedList
       - numberedList
       - sourceEditing

config/sync/filter.format.html.yml

@@ -2,11 +2,9 @@ uuid: 5d18c973-9aef-4dfe-94ba-cb2f2d596598
 langcode: en
 status: true
 dependencies:
-  config:
-    - core.entity_view_mode.media.full
-    - core.entity_view_mode.media.media_library
   module:
     - auto_heading_ids
+    - dg_fields
     - editor
     - embedded_content
     - linkit
@@ -19,94 +17,97 @@ filters:
     id: editor_file_reference
     provider: editor
     status: false
-    weight: -43
+    weight: -41
     settings: {  }
   embedded_content:
     id: embedded_content
     provider: embedded_content
     status: true
-    weight: -48
+    weight: -49
     settings: {  }
   filter_align:
     id: filter_align
     provider: filter
     status: true
-    weight: -42
+    weight: -47
     settings: {  }
   filter_autop:
     id: filter_autop
     provider: filter
-    status: true
-    weight: -50
+    status: false
+    weight: -45
+    settings: {  }
+  filter_breaks:
+    id: filter_breaks
+    provider: dg_fields
+    status: false
+    weight: -36
     settings: {  }
   filter_caption:
     id: filter_caption
     provider: filter
     status: false
-    weight: -41
+    weight: -40
     settings: {  }
   filter_html:
     id: filter_html
     provider: filter
     status: false
-    weight: -45
+    weight: -43
     settings:
-      allowed_html: '<span class="highlight-text"> <div class="box"> <a class="usa-button usa-button--outline">'
+      allowed_html: '<span class="highlight-text"> <div class="box"> <a class="usa-button usa-button--outline"> <ul class="dg-checklist dg-checklist--no-border">'
       filter_html_help: true
       filter_html_nofollow: false
   filter_html_escape:
     id: filter_html_escape
     provider: filter
     status: false
-    weight: -44
+    weight: -42
     settings: {  }
   filter_html_image_secure:
     id: filter_html_image_secure
     provider: filter
     status: false
-    weight: -40
+    weight: -39
     settings: {  }
   filter_htmlcorrector:
     id: filter_htmlcorrector
     provider: filter
     status: false
-    weight: -39
+    weight: -38
     settings: {  }
   filter_image_lazy_load:
     id: filter_image_lazy_load
     provider: filter
     status: false
-    weight: -38
+    weight: -37
     settings: {  }
   filter_url:
     id: filter_url
     provider: filter
     status: false
-    weight: -46
+    weight: -44
     settings:
       filter_url_length: 72
   heading_id_filter:
     id: heading_id_filter
     provider: auto_heading_ids
     status: true
-    weight: 10
+    weight: -46
     settings: {  }
   linkit:
     id: linkit
     provider: linkit
     status: true
-    weight: -49
+    weight: -50
     settings:
       title: true
   media_embed:
     id: media_embed
     provider: media
     status: true
-    weight: -47
+    weight: -48
     settings:
       default_view_mode: default
-      allowed_view_modes:
-        default: default
-        full: full
-        media_library: media_library
+      allowed_view_modes: {  }
       allowed_media_types: {  }

config/sync/responsive_image.styles.digital_gov_responsive_images.yml

@@ -6,25 +6,18 @@ dependencies:
     - image.style.dg_large_scale_to_1200_convert_to_webp
     - image.style.dg_medium_800_max_convert_to_webp
     - image.style.dg_small
-  theme:
-    - digital_gov
 id: digital_gov_responsive_images
-label: 'Digital.gov Responsive Images'
+label: 'Digital.gov Responsive Image: Default'
 image_style_mappings:
   -
-    image_mapping_type: image_style
-    image_mapping: dg_large_scale_to_1200_convert_to_webp
-    breakpoint_id: digital_gov.large
+    image_mapping_type: sizes
+    image_mapping:
+      sizes: '(max-width: 600px) 40vw, 100vw'
+      sizes_image_styles:
+        - dg_large_scale_to_1200_convert_to_webp
+        - dg_medium_800_max_convert_to_webp
+        - dg_small
+    breakpoint_id: responsive_image.viewport_sizing
     multiplier: 1x
-  -
-    image_mapping_type: image_style
-    image_mapping: dg_medium_800_max_convert_to_webp
-    breakpoint_id: digital_gov.medium
-    multiplier: 1x
-  -
-    image_mapping_type: image_style
-    image_mapping: dg_small
-    breakpoint_id: digital_gov.small
-    multiplier: 1x
-breakpoint_group: digital_gov
+breakpoint_group: responsive_image
 fallback_image_style: dg_small

web/modules/custom/default_content_config/content/node/fd186b65-70b7-499a-a9be-050562561209.yml

@@ -5,6 +5,8 @@
  * Primary module hooks for Digital.gov Fields module.
  */
 
+use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
@@ -23,3 +25,28 @@ function dg_fields_form_node_form_alter(array &$form, FormStateInterface $form_s
     );
   }
 }
+
+/**
+ * Implements hook_entity_view_alter().
+ */
+function dg_fields_entity_view_alter(array &$build, EntityInterface $entity, EntityViewDisplayInterface $display): void {
+  if ($display->getTargetBundle() === 'video' && ($build['#embed'] ?? FALSE)) {
+    // Media wants to proxy the URL to the video, we should use the direct URL
+    // so the player works when exported by Tome.
+    $videoURL = $entity->get('field_media_oembed_video')->first()->getValue()['value'];
+    // Youtube blocks iframe-ing unless the URL is to /embed/.
+    $videoURL = str_replace("youtube.com/watch?v=", "youtube.com/embed/", $videoURL);
+    $build["field_media_oembed_video"][0]["#attributes"]['src'] = $videoURL;
+
+    if (str_contains($videoURL, 'youtube.com/embed/')) {
+      // Customize the HTML for YouTube iframes.
+      unset(
+        $build["field_media_oembed_video"][0]["#attributes"]["height"],
+        $build["field_media_oembed_video"][0]["#attributes"]["width"]
+      );
+      $build["field_media_oembed_video"][0]["#attributes"]["style"] = "position: absolute; top: 0; left: 0; width: 100%; height: 100%;";
+      $build["field_media_oembed_video"][0]["#attributes"]["allowfullscreen"] = "";
+      $build["field_media_oembed_video"][0]["#attributes"]["frameborder"] = 0;
+    }
+  }
+}

web/modules/custom/dg_fields/dg_fields.module

@@ -10,12 +10,6 @@
  */
 function ec_shortcodes_theme($existing, $type, $theme, $path) {
   return [
-    'ec_shortcodes_button' => [
-      'variables' => [
-        'url' => NULL,
-        'text' => NULL,
-      ],
-    ],
     'ec_shortcodes_accordion' => [
       'variables' => [
         'kicker' => NULL,
@@ -42,15 +36,11 @@ function ec_shortcodes_theme($existing, $type, $theme, $path) {
     ],
     'ec_shortcodes_card_quote' => [
       'variables' => [
+        'dark' => NULL,
         'text' => NULL,
         'cite' => NULL,
       ],
     ],
-    'ec_shortcodes_checklist' => [
-      'variables' => [
-        'checklist' => NULL,
-      ],
-    ],
     'ec_shortcodes_do_dont_table' => [
       'variables' => [
         'caption' => NULL,