Fixes #2 - simplified the module by removing a new theme hook/preprocess function/template and instead just added the wrapper div "<div class='c2pa-wrapper'></div>" to the render array (#8)

Co-authored-by: James R Glasgow <james.glasgow@associates.hq.dhs.gov>

Author: jrglasgow

c2pa.module

@@ -4,45 +4,3 @@
  * @file
  * Primary module hooks for c2pa module.
  */
-
- function c2pa_page_attachments(array &$page) {
-  $page['#attached']['library'][] = 'c2pa/c2pa';
- }
-
- function c2pa_theme($existing, $type, $theme, $path) {
-  return [
-    'c2pa_image_formatter' => [
-      'variables' => [
-        'item' => NULL,
-        'item_attributes' => NULL,
-        'url' => NULL,
-        'image_style' => NULL
-      ]
-    ]
-  ];
- }
-
- function template_preprocess_c2pa_image_formatter(&$variables) {
-  $variables['image'] = [
-    '#theme' => 'image',
-  ];
-  $variables['image']['#attributes'] = $variables['item_attributes'];
-
-  $item = $variables['item'];
-
-  // Do not output an empty 'title' attribute.
-  if (!is_null($item->title) && mb_strlen($item->title) != 0) {
-    $variables['image']['#title'] = $item->title;
-  }
-
-  if (($entity = $item->entity) && empty($item->uri)) {
-    $variables['image']['#uri'] = $entity->getFileUri();
-  }
-  else {
-    $variables['image']['#uri'] = $item->uri;
-  }
-
-  foreach (['width', 'height', 'alt'] as $key) {
-    $variables['image']["#$key"] = $item->$key;
-  }
- }

src/Plugin/Field/FieldFormatter/C2paImageFormatter.php

@@ -22,7 +22,7 @@ class C2paImageFormatter extends ImageFormatter {
    * {@inheritdoc}
    */
   public function settingsSummary() {
-    $summary = [];
+    $summary = parent::settingsSummary();
     $summary[] = $this->t('Formats the image for use with the c2pa module');
     return $summary;
   }
@@ -34,7 +34,19 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
     $elements = parent::viewElements($items, $langcode);
 
     foreach ($elements as &$element) {
-      $element['#theme'] = 'c2pa_image_formatter';
+      // wrap the element in a container with the appropriate class
+      $element = [
+        '#type' => 'container',
+        '#attributes' => [
+          'class' => 'c2pa-wrapper',
+        ],
+        'image' => $element,
+        '#attached' => [
+          // the library doesn't need to be on every page load, just those with
+          // images and a wrapping container with the c2pa-wrapper class
+          'library' => 'c2pa/c2pa'
+        ],
+      ];
     }
 
     // foreach ($items as $delta => $item) {
@@ -47,4 +59,4 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
     return $elements;
   }
 
-}
+}