From 04e311b0ccd3b168d1f3fb6238329bcb3c6cf4ff Mon Sep 17 00:00:00 2001
From: ShimaginAndrey <andrey.shimagin@onlyoffice.com>
Date: Mon, 18 Oct 2021 10:17:49 +0300
Subject: [PATCH] Refactoring code v2

---
 apps/documenteditor/mobile/src/view/add/AddTable.jsx     | 9 +--------
 apps/documenteditor/mobile/src/view/edit/EditTable.jsx   | 9 +--------
 apps/presentationeditor/mobile/src/view/add/AddOther.jsx | 9 +--------
 .../mobile/src/view/edit/EditTable.jsx                   | 9 +--------
 4 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/apps/documenteditor/mobile/src/view/add/AddTable.jsx b/apps/documenteditor/mobile/src/view/add/AddTable.jsx
index f82720447..625c58a6a 100644
--- a/apps/documenteditor/mobile/src/view/add/AddTable.jsx
+++ b/apps/documenteditor/mobile/src/view/add/AddTable.jsx
@@ -9,18 +9,11 @@ const AddTable = props => {
 
     const storeTableSettings = props.storeTableSettings;
     const styles = storeTableSettings.arrayStyles;
-    const [stateLoaderSkeleton, setLoaderSkeleton] = useState(true);
-
-    useEffect(() => {
-
-        !styles.length ? setLoaderSkeleton(true) : setLoaderSkeleton(false);
-
-    }, [styles]);
 
     return (
         <div className={'table-styles dataview'}>
             <ul className="row">
-            {stateLoaderSkeleton ?
+            {!styles.length ?
                 Array.from({ length: 70 }).map((item,index) => (
                 <li className='skeleton-list' key={index}>    
                     <SkeletonBlock  width='70px' height='8px'  effect='wave'/>
diff --git a/apps/documenteditor/mobile/src/view/edit/EditTable.jsx b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx
index 4eeaf0c5c..84b449c1b 100644
--- a/apps/documenteditor/mobile/src/view/edit/EditTable.jsx
+++ b/apps/documenteditor/mobile/src/view/edit/EditTable.jsx
@@ -177,23 +177,16 @@ const StyleTemplates = inject("storeFocusObjects","storeTableSettings")(observer
     const tableObject = storeFocusObjects.tableObject;
     const styleId = tableObject && tableObject.get_TableStyle();
     const [stateId, setId] = useState(styleId);
-    const [stateLoaderSkeleton, setLoaderSkeleton] = useState(true);
     const styles =  storeTableSettings.arrayStyles;
 
     useEffect(() => {
         if(!styles.length) onGetTableStylesPreviews();
     }, []);
-
-    useEffect(() => {
-
-        !styles.length ? setLoaderSkeleton(true) : setLoaderSkeleton(false);
-
-    }, [styles]);
     
     return (
         <div className="dataview table-styles">
             <ul className="row">
-                { stateLoaderSkeleton ?
+                { !styles.length ?
                     Array.from({ length: 27 }).map((item,index) => (
                     <li className='skeleton-list' key={index}>    
                         <SkeletonBlock  width='70px' height='8px'  effect='wave'/>
diff --git a/apps/presentationeditor/mobile/src/view/add/AddOther.jsx b/apps/presentationeditor/mobile/src/view/add/AddOther.jsx
index 00316b239..13f3cd723 100644
--- a/apps/presentationeditor/mobile/src/view/add/AddOther.jsx
+++ b/apps/presentationeditor/mobile/src/view/add/AddOther.jsx
@@ -10,20 +10,13 @@ const PageTable = props => {
     const _t = t('View.Add', {returnObjects: true});
     const storeTableSettings = props.storeTableSettings;
     const styles = storeTableSettings.arrayStyles;
-    const [stateLoaderSkeleton, setLoaderSkeleton] = useState(true);
-
-    useEffect(() => {
-
-        !styles.length ? setLoaderSkeleton(true) : setLoaderSkeleton(false);
-
-    }, [styles]);
 
     return (
         <Page id={'add-table'}>
             <Navbar title={_t.textTable} backLink={_t.textBack}/>
             <div className={'table-styles dataview'}>
                 <ul className="row">
-                {stateLoaderSkeleton ?
+                {!styles.length ?
                     Array.from({ length: 70 }).map((item,index) => (
                     <li className='skeleton-list' key={index}>    
                         <SkeletonBlock  width='70px' height='8px'  effect='wave'/>
diff --git a/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx b/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx
index b18c586eb..c177958a1 100644
--- a/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx
+++ b/apps/presentationeditor/mobile/src/view/edit/EditTable.jsx
@@ -11,19 +11,12 @@ const StyleTemplates = inject("storeFocusObjects","storeTableSettings")(observer
     const tableObject = storeFocusObjects.tableObject;
     const styleId = tableObject ? tableObject.get_TableStyle() : null;
     const [stateId, setId] = useState(styleId);
-    const [stateLoaderSkeleton, setLoaderSkeleton] = useState(true);
     const styles =  storeTableSettings.arrayStyles;
     
     useEffect(() => {
         if(!styles.length) setTimeout(() => onGetTableStylesPreviews(), 1);
     }, []);
 
-    useEffect(() => {
-
-        !styles.length ? setLoaderSkeleton(true) : setLoaderSkeleton(false);
-
-    }, [styles]);
-
     if (!tableObject && Device.phone) {
         $$('.sheet-modal.modal-in').length > 0 && f7.sheet.close();
         return null;
@@ -32,7 +25,7 @@ const StyleTemplates = inject("storeFocusObjects","storeTableSettings")(observer
     return (
         <div className="dataview table-styles">
             <ul className="row">
-            { stateLoaderSkeleton ?
+            { !styles.length ?
                     Array.from({ length: 34 }).map((item,index) => (
                     <li className='skeleton-list' key={index}>    
                         <SkeletonBlock  width='70px' height='8px'  effect='wave'/>