For Bug 47822

This commit is contained in:
ShimaginAndrey 2021-07-29 14:21:12 +03:00
parent 27f31709c8
commit 981b2843d1
2 changed files with 19 additions and 4 deletions

View file

@ -5,6 +5,7 @@ export class storeTextSettings {
makeObservable(this, {
fontsArray: observable,
fontName: observable,
positionElemList:observable,
fontSize: observable,
isBold: observable,
isItalic: observable,
@ -39,12 +40,14 @@ export class storeTextSettings {
changeCustomTextColors: action,
resetLineSpacing: action,
resetBackgroundColor: action,
changeFontFamily: action
changeFontFamily: action,
changeHeightElement : action,
});
}
fontsArray = [];
fontName = '';
positionElemList = null;
fontSize = undefined;
isBold = false;
isItalic = false;
@ -173,6 +176,10 @@ export class storeTextSettings {
this.fontName = name;
}
changeHeightElement(pos) {
this.positionElemList = pos;
}
resetLineSpacing (vc) {
let line = (vc.get_Line() === null || vc.get_LineRule() === null || vc.get_LineRule() != 1) ? -1 : vc.get_Line();
this.lineSpacing = line;

View file

@ -1,4 +1,4 @@
import React, {Fragment, useState } from 'react';
import React, {Fragment, useState, useEffect } from 'react';
import {observer, inject} from "mobx-react";
import {f7, Swiper, View, SwiperSlide, List, ListItem, Icon, Row, Button, Page, Navbar, NavRight, Segmented, BlockTitle, Link} from 'framework7-react';
import { useTranslation } from 'react-i18next';
@ -9,11 +9,17 @@ import { ThemeColorPalette, CustomColorPicker } from '../../../../../common/mobi
const PageFonts = props => {
const isAndroid = Device.android;
const { t } = useTranslation();
useEffect(() => {
$$('.edit-fonts .page-content').scrollTop(positionElement, 1500)
}, []);
const storeTextSettings = props.storeTextSettings;
const size = storeTextSettings.fontSize;
const displaySize = typeof size === 'undefined' ? t('Edit.textAuto') : size + ' ' + t('Edit.textPt');
const curFontName = storeTextSettings.fontName;
const fonts = storeTextSettings.fontsArray;
const positionElement = storeTextSettings.positionElemList;
const [vlFonts, setVlFonts] = useState({
vlData: {
items: [],
@ -30,7 +36,7 @@ const PageFonts = props => {
};
return (
<Page>
<Page className="edit-fonts">
<Navbar title={t('Edit.textFonts')} backLink={t('Edit.textBack')}>
{Device.phone &&
<NavRight>
@ -65,11 +71,13 @@ const PageFonts = props => {
{vlFonts.vlData.items.map((item, index) => (
<ListItem
key={index}
className = 'list-item'
radio
checked={curFontName === item.name}
title={item.name}
style={{fontFamily: `${item.name}`}}
onClick={() => {storeTextSettings.changeFontFamily(item.name); props.changeFontFamily(item.name)}}
onClick={() => {storeTextSettings.changeFontFamily(item.name); props.changeFontFamily(item.name);
storeTextSettings.changeHeightElement(($$('.list-item').height()*index))}}
></ListItem>
))}
</ul>