@diplodoc/transform 4.77.11 → 4.77.12

package/src/transform/plugins/images/index.ts

@@ -155,6 +155,11 @@ function collectDataAttrs(
             continue;
         }
 
+        if (key === 'gallery-id' && value !== '') {
+            result['data-gallery-id'] = value;
+            continue;
+        }
+
         const gallerySrc = resolveGallerySrcAttr(
             key,
             value,
@@ -173,6 +178,7 @@ function collectDataAttrs(
         if (
             key.startsWith('data-') &&
             key !== 'data-gallery-src' &&
+            (key !== 'data-gallery-id' || value !== '') &&
             (key !== 'data-gallery' || isGalleryValid(value))
         ) {
             result[key] = value;
@@ -182,10 +188,17 @@ function collectDataAttrs(
     image.attrs = image.attrs.filter(
         ([key, value]) =>
             key !== 'gallery' &&
+            key !== 'gallery-id' &&
             key !== 'gallery-src' &&
             (key !== 'data-gallery' || isGalleryValid(value)) &&
+            (key !== 'data-gallery-id' || value !== '') &&
             (key !== 'data-gallery-src' || value !== ''),
     );
+
+    if (result['data-gallery-id']) {
+        result['data-gallery'] = 'true';
+    }
+
     return result;
 }
 

package/src/transform/plugins/imsize/plugin.ts

@@ -307,19 +307,26 @@ function isOwnAttr(key: string): boolean {
         key === 'height' ||
         key === 'inline' ||
         key === 'gallery' ||
+        key === 'gallery-id' ||
         key === 'gallery-src' ||
         key.startsWith('data-')
     );
 }
 
 function resolveDataAttr(key: string, value: string): [string, string] | null {
-    const isGalleryValid = value === 'true' || value === 'false';
+    if (key === 'gallery' || key === 'data-gallery') {
+        const isGalleryValid = value === 'true' || value === 'false';
 
-    if (key === 'gallery') return isGalleryValid ? ['data-gallery', value] : null;
-    if (key === 'data-gallery') return isGalleryValid ? [key, value] : null;
-    if (key === 'gallery-src') return value === '' ? null : ['data-gallery-src', value];
-    if (key.startsWith('data-')) return [key, value];
-    return null;
+        return isGalleryValid ? ['data-gallery', value] : null;
+    }
+
+    if (key === 'gallery-id' || key === 'gallery-src') {
+        if (value === '') return null;
+
+        return [`data-${key}`, value];
+    }
+
+    return key.startsWith('data-') ? [key, value] : null;
 }
 
 function parseInlineAttributes(attrsStr: string): ParsedAttrs {
@@ -358,6 +365,10 @@ function parseInlineAttributes(attrsStr: string): ParsedAttrs {
         }
     }
 
+    if (result.dataAttrs?.['data-gallery-id']) {
+        result.dataAttrs['data-gallery'] = 'true';
+    }
+
     // The block is fully ours only if it carries our attributes and nothing
     // foreign is left over — otherwise someone downstream has to parse it.
     result.foreign = own === 0 || ownChars !== dense(attrsStr);