From 080d748671a972b833517575870bb6b090d45d96 Mon Sep 17 00:00:00 2001
From: Anatol Sialitski <asi@enonic.com>
Date: Wed, 11 Oct 2023 16:07:44 +0200
Subject: [PATCH] Missing styles in RichText for images #608

---
 gradle.properties                                     |  2 +-
 .../java/com/enonic/app/guillotine/ServiceFacade.java | 11 ++++++++++-
 .../graphql/fetchers/RichTextDataFetcher.java         |  1 +
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 837b3f2a..70ec3dbc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,6 +4,6 @@
 group=com.enonic.app
 projectName=guillotine
 appName=com.enonic.app.guillotine
-xpVersion=7.12.1
+xpVersion=7.14.0-SNAPSHOT
 version=7.0.0-SNAPSHOT
 
diff --git a/src/main/java/com/enonic/app/guillotine/ServiceFacade.java b/src/main/java/com/enonic/app/guillotine/ServiceFacade.java
index ba731f52..63d16073 100644
--- a/src/main/java/com/enonic/app/guillotine/ServiceFacade.java
+++ b/src/main/java/com/enonic/app/guillotine/ServiceFacade.java
@@ -13,6 +13,7 @@
 import com.enonic.xp.portal.url.PortalUrlService;
 import com.enonic.xp.schema.content.ContentTypeService;
 import com.enonic.xp.schema.mixin.MixinService;
+import com.enonic.xp.style.StyleDescriptorService;
 
 @Component(immediate = true, service = ServiceFacade.class)
 public class ServiceFacade
@@ -35,13 +36,16 @@ public class ServiceFacade
 
     private final PageTemplateService pageTemplateService;
 
+    private final StyleDescriptorService styleDescriptorService;
+
     @Activate
     public ServiceFacade( final @Reference ContentService contentService, final @Reference ContentTypeService contentTypeService,
                           final @Reference ComponentDescriptorService componentDescriptorService,
                           final @Reference PortalUrlService portalUrlService, final @Reference NodeService nodeService,
                           final @Reference MixinService mixinService, final @Reference MacroService macroService,
                           final @Reference MacroDescriptorService macroDescriptorService,
-                          final @Reference PageTemplateService pageTemplateService )
+                          final @Reference PageTemplateService pageTemplateService,
+                          final @Reference StyleDescriptorService styleDescriptorService )
     {
         this.contentService = contentService;
         this.contentTypeService = contentTypeService;
@@ -52,6 +56,7 @@ public ServiceFacade( final @Reference ContentService contentService, final @Ref
         this.macroService = macroService;
         this.macroDescriptorService = macroDescriptorService;
         this.pageTemplateService = pageTemplateService;
+        this.styleDescriptorService = styleDescriptorService;
     }
 
     public ContentService getContentService()
@@ -99,4 +104,8 @@ public PageTemplateService getPageTemplateService()
         return pageTemplateService;
     }
 
+    public StyleDescriptorService getStyleDescriptorService()
+    {
+        return styleDescriptorService;
+    }
 }
diff --git a/src/main/java/com/enonic/app/guillotine/graphql/fetchers/RichTextDataFetcher.java b/src/main/java/com/enonic/app/guillotine/graphql/fetchers/RichTextDataFetcher.java
index 935ede5f..84fef49f 100644
--- a/src/main/java/com/enonic/app/guillotine/graphql/fetchers/RichTextDataFetcher.java
+++ b/src/main/java/com/enonic/app/guillotine/graphql/fetchers/RichTextDataFetcher.java
@@ -70,6 +70,7 @@ public Object get( final DataFetchingEnvironment environment )
         Map<String, MacroDescriptor> registeredMacros = guillotineContext.getMacroDecorators();
 
         htmlParams.processMacros( false );
+        htmlParams.customStyleDescriptorsCallback( () -> serviceFacade.getStyleDescriptorService().getAll() );
         htmlParams.customHtmlProcessor( processor -> {
             processor.processDefault( new CustomHtmlPostProcessor( links, images ) );