From 3b9d9925e1ffb33cfc936c6a2add3ad8281c7ff2 Mon Sep 17 00:00:00 2001
From: Andrey Shimagin <andrey.shimagin@onlyoffice.com>
Date: Tue, 26 Apr 2022 15:19:20 +0300
Subject: [PATCH] [PE] Correct import and change styles icons-rtl

---
 .../mobile/resources/less/common-rtl.less       | 10 ----------
 .../common/mobile/resources/less/icons.rtl.less | 17 +++++++++++++++++
 apps/presentationeditor/mobile/src/app.js       |  2 +-
 .../mobile/src/less/app-rtl.less                | 10 +---------
 4 files changed, 19 insertions(+), 20 deletions(-)
 create mode 100644 apps/common/mobile/resources/less/icons.rtl.less

diff --git a/apps/common/mobile/resources/less/common-rtl.less b/apps/common/mobile/resources/less/common-rtl.less
index adb8c399c..57f77664f 100644
--- a/apps/common/mobile/resources/less/common-rtl.less
+++ b/apps/common/mobile/resources/less/common-rtl.less
@@ -90,16 +90,6 @@
 }
 
 [dir="rtl"] {
-    i.icon {
-        i.icon.icon-next, i.icon.icon-prev, i.icon.icon-prev-change, i.icon.icon-next-change,
-        &.icon-search, &.icon-link, &.icon-edit-settings, &.icon-app-settings, &.icon-add-shape, &.icon-add-image, 
-        &.icon-image-library, &.icon-text-align-right, &.icon-text-align-left, &.icon-table-add-column-left,
-        &.icon-table-add-column-right, &.icon-table-add-row-above, &.icon-table-add-row-below, &.icon-table-remove-row,
-        &.icon-table-remove-column, &.icon-paste, &.icon-copy, &.icon-table-borders-left, &.icon-table-borders-right {
-            transform: scaleX(-1);
-        }
-    }
-
     .comment-list .item-content .item-inner{
         padding-left: 0;
         .comment-header {
diff --git a/apps/common/mobile/resources/less/icons.rtl.less b/apps/common/mobile/resources/less/icons.rtl.less
new file mode 100644
index 000000000..eb6320102
--- /dev/null
+++ b/apps/common/mobile/resources/less/icons.rtl.less
@@ -0,0 +1,17 @@
+[dir="rtl"] {
+    // Common rtl-icons
+    i.icon {
+        &.icon-next, &.icon-prev, &.icon-text-align-right, &.icon-text-align-left, 
+        &.icon-table-add-column-left, &.icon-table-add-column-right, &.icon-table-remove-column, 
+        &.icon-table-borders-left, &.icon-table-borders-right {
+            transform: scaleX(-1);
+        }
+    }
+
+    // [PE] rtl-icons 
+    i.icon {
+        &.icon-align-left, &.icon-align-right {
+            transform: scaleX(-1);
+        }
+    }
+}
\ No newline at end of file
diff --git a/apps/presentationeditor/mobile/src/app.js b/apps/presentationeditor/mobile/src/app.js
index 7f5b031bd..f1b43f913 100644
--- a/apps/presentationeditor/mobile/src/app.js
+++ b/apps/presentationeditor/mobile/src/app.js
@@ -17,8 +17,8 @@ window.$ = jQuery;
 // Import Framework7 or Framework7-RTL Styles
 let direction = LocalStorage.getItem('mode-direction');
 
+direction === 'rtl' ? $$('html').attr('dir', 'rtl') : $$('html').removeAttr('dir')
 import(`framework7/framework7-bundle${direction === 'rtl' ? '-rtl' : ''}.css`)
-.then(() => direction === 'rtl' ? $$('html').attr('dir', 'rtl') : $$('html').removeAttr('dir'));
 
 // Import App Custom Styles
 import('./less/app.less');
diff --git a/apps/presentationeditor/mobile/src/less/app-rtl.less b/apps/presentationeditor/mobile/src/less/app-rtl.less
index 42850257b..c6b088922 100644
--- a/apps/presentationeditor/mobile/src/less/app-rtl.less
+++ b/apps/presentationeditor/mobile/src/less/app-rtl.less
@@ -1,15 +1,7 @@
 @import '../../../../common/mobile/resources/less/common-rtl.less';
+@import '../../../../common/mobile/\/resources/less/icons.rtl.less';
 
 [dir="rtl"] {
-
-    i.icon {
-        &.icon-setup, &.icon-move-foreground, &.icon-move-background, &.icon-move-forward,
-        &.icon-move-backward, &.icon-align-left, &.icon-align-right,
-        &.icon-align-top, &.icon-align-middle, &.icon-align-bottom, &.icon-align-horizontal {
-            transform: scaleX(-1);
-        }
-    }
-
     .slide-theme .item-theme.active:before {
         left: -5px;
         right: unset;