From f1183bb4d98cb7c4afbb9854848b9c054adac783 Mon Sep 17 00:00:00 2001 From: alexandra javorska Date: Mon, 13 Nov 2023 11:02:47 +0100 Subject: [PATCH 1/6] Added font size selector --- .../Settings/Export/Export.component.js | 54 ++++++++++++++- .../Settings/Export/Export.container.js | 27 ++++++-- .../Settings/Export/Export.helpers.js | 69 ++++++++++++++++--- .../Settings/Export/Export.messages.js | 12 ++++ 4 files changed, 146 insertions(+), 16 deletions(-) diff --git a/src/components/Settings/Export/Export.component.js b/src/components/Settings/Export/Export.component.js index 80716804d..2a11345fa 100644 --- a/src/components/Settings/Export/Export.component.js +++ b/src/components/Settings/Export/Export.component.js @@ -39,6 +39,7 @@ class Export extends React.Component { this.state = { exportSingleBoard: '', exportAllBoard: '', + exportAllBoardSize: '16', singleBoard: '', loadingSingle: false, loadingAll: false, @@ -61,6 +62,13 @@ class Export extends React.Component { }); }; + handleSizeChange = event => { + this.setState({ + boardError: false, + exportAllBoardSize: event.target.value + }); + }; + handleAllBoardChange = event => { const doneCallback = () => { this.setState({ @@ -74,7 +82,12 @@ class Export extends React.Component { exportAllBoard: event.target.value }, () => { - this.props.onExportClick(this.state.exportAllBoard, '', doneCallback); + this.props.onExportClick( + this.state.exportAllBoard, + '', + this.state.exportAllBoardSize, + doneCallback + ); } ); }; @@ -101,6 +114,7 @@ class Export extends React.Component { this.props.onExportClick( this.state.exportSingleBoard, this.state.singleBoard, + this.state.exportAllBoardSize, doneCallback ); } @@ -282,6 +296,44 @@ class Export extends React.Component { + + + } + secondary={} + /> + +
+ {this.state.loadingAll && ( + + )} + + + {intl.formatMessage(messages.size)} + + + +
+ + diff --git a/src/components/Settings/Export/Export.container.js b/src/components/Settings/Export/Export.container.js index b401763db..6dffc3e30 100644 --- a/src/components/Settings/Export/Export.container.js +++ b/src/components/Settings/Export/Export.container.js @@ -19,6 +19,7 @@ export class ExportContainer extends PureComponent { handleExportClick = async ( type = 'cboard', singleBoard = '', + exportAllBoardSize = '', doneCallback ) => { const exportConfig = EXPORT_CONFIG_BY_TYPE[type]; @@ -42,6 +43,7 @@ export class ExportContainer extends PureComponent { if (singleBoard) { await EXPORT_HELPERS[exportConfig.callback]( [singleBoard], + exportAllBoardSize, intl, true ); @@ -49,18 +51,35 @@ export class ExportContainer extends PureComponent { const currentBoard = boards.filter( board => board.id === activeBoardId ); - await EXPORT_HELPERS[exportConfig.callback](currentBoard, intl, true); + await EXPORT_HELPERS[exportConfig.callback]( + currentBoard, + exportAllBoardSize, + intl, + true + ); } } else if (type !== 'pdf' && !singleBoard) { - await EXPORT_HELPERS[exportConfig.callback](boards, intl); + await EXPORT_HELPERS[exportConfig.callback]( + boards, + exportAllBoardSize, + intl + ); } else { if (singleBoard) { - await EXPORT_HELPERS[exportConfig.callback]([singleBoard], intl); + await EXPORT_HELPERS[exportConfig.callback]( + [singleBoard], + exportAllBoardSize, + intl + ); } else { const currentBoard = boards.filter( board => board.id === activeBoardId ); - await EXPORT_HELPERS[exportConfig.callback](currentBoard, intl); + await EXPORT_HELPERS[exportConfig.callback]( + currentBoard, + exportAllBoardSize, + intl + ); } } const showBoardDowloadedNotification = () => { diff --git a/src/components/Settings/Export/Export.helpers.js b/src/components/Settings/Export/Export.helpers.js index 037726117..09f11c26f 100644 --- a/src/components/Settings/Export/Export.helpers.js +++ b/src/components/Settings/Export/Export.helpers.js @@ -372,16 +372,24 @@ function getCellWidths(columns, picsee = false) { return cellWidths; } -async function generatePDFBoard(board, intl, breakPage = true, picsee = false) { +async function generatePDFBoard( + board, + intl, + breakPage = true, + picsee = false, + exportAllBoardSize +) { const header = { absolutePosition: { x: 0, y: 5 }, text: board.name || '', alignment: 'center', fontSize: 8 }; + const columns = board.isFixed && board.grid ? board.grid.columns : CBOARD_COLUMNS; const rows = board.isFixed && board.grid ? board.grid.rows : CBOARD_ROWS; + const cellWidths = getCellWidths(columns, picsee); const table = { @@ -401,8 +409,22 @@ async function generatePDFBoard(board, intl, breakPage = true, picsee = false) { } const grid = board.isFixed - ? await generateFixedBoard(board, rows, columns, intl, picsee) - : await generateNonFixedBoard(board, rows, columns, intl, picsee); + ? await generateFixedBoard( + board, + rows, + columns, + intl, + picsee, + exportAllBoardSize + ) + : await generateNonFixedBoard( + board, + rows, + columns, + intl, + picsee, + exportAllBoardSize + ); const lastGridRowDiff = columns - grid[grid.length - 2].length; // labels row if (lastGridRowDiff > 0) { @@ -427,7 +449,14 @@ function chunks(array, size) { return results; } -async function generateFixedBoard(board, rows, columns, intl, picsee = false) { +async function generateFixedBoard( + board, + rows, + columns, + intl, + picsee = false, + exportAllBoardSize +) { let currentRow = 0; let cont = 0; @@ -482,7 +511,8 @@ async function generateFixedBoard(board, rows, columns, intl, picsee = false) { columns, currentRow, pageBreak, - picsee + picsee, + exportAllBoardSize ); cont++; } @@ -496,7 +526,8 @@ async function generateNonFixedBoard( rows, columns, intl, - picsee = false + picsee = false, + exportAllBoardSize ) { // Do a grid with 2n rows const grid = new Array(Math.ceil(board.tiles.length / columns) * 2); @@ -526,7 +557,8 @@ async function generateNonFixedBoard( columns, currentRow, pageBreak, - picsee + picsee, + exportAllBoardSize ); }, Promise.resolve()); return grid; @@ -540,7 +572,8 @@ const addTileToGrid = async ( columns, currentRow, pageBreak = false, - picsee = false + picsee = false, + exportAllBoardSize ) => { const { label, image } = getPDFTileData(tile, intl); const fixedRow = currentRow * 2; @@ -598,6 +631,7 @@ const addTileToGrid = async ( const labelData = { text: label, alignment: 'center', + fontSize: exportAllBoardSize, fillColor: hexBackgroundColor, border: PDF_GRID_BORDER[labelPosition].labelData }; @@ -845,9 +879,13 @@ export async function cboardExportAdapter(allBoards = [], board) { } } -export async function pdfExportAdapter(boards = [], intl, picsee = false) { +export async function pdfExportAdapter( + boards = [], + exportAllBoardSize, + intl, + picsee = false +) { const font = definePDFfont(intl); - const docDefinition = { pageSize: 'A4', pageOrientation: 'landscape', @@ -858,6 +896,9 @@ export async function pdfExportAdapter(boards = [], intl, picsee = false) { } }; if (picsee) { + //exportAllBoardSize = exportAllBoardSize - 4; + exportAllBoardSize = + exportAllBoardSize > 20 ? exportAllBoardSize - 3 : exportAllBoardSize; docDefinition.background = function() { return { stack: [ @@ -921,7 +962,13 @@ export async function pdfExportAdapter(boards = [], intl, picsee = false) { const content = await boards.reduce(async (prev, board, i) => { const prevContent = await prev; const breakPage = i !== 0; - const boardPDFData = await generatePDFBoard(board, intl, breakPage, picsee); + const boardPDFData = await generatePDFBoard( + board, + intl, + breakPage, + picsee, + exportAllBoardSize + ); return prevContent.concat(boardPDFData); }, Promise.resolve([])); diff --git a/src/components/Settings/Export/Export.messages.js b/src/components/Settings/Export/Export.messages.js index 39aa3a58e..6cecf9128 100644 --- a/src/components/Settings/Export/Export.messages.js +++ b/src/components/Settings/Export/Export.messages.js @@ -18,6 +18,18 @@ export default defineMessages({ id: 'cboard.components.Settings.Export.exportAll', defaultMessage: 'Export All Boards' }, + properties: { + id: 'cboard.components.Settings.Export.properties', + defaultMessage: 'Settings' + }, + propertiesSize: { + id: 'cboard.components.Settings.Export.propertiesSize', + defaultMessage: 'General PDF settings' + }, + size: { + id: 'cboard.components.Settings.Export.size', + defaultMessage: 'Font size' + }, exportAllSecondary: { id: 'cboard.components.Settings.Export.exportAllSecondary', defaultMessage: From 38ecb000e97a101560f88d888684ca7cbbe2a85a Mon Sep 17 00:00:00 2001 From: alexandra javorska Date: Wed, 15 Nov 2023 17:22:13 +0100 Subject: [PATCH 2/6] add of request changes --- .../Settings/Export/Export.component.js | 33 +++++++++++------ .../Settings/Export/Export.container.js | 12 +++--- src/components/Settings/Export/Export.css | 9 +++++ .../Settings/Export/Export.helpers.js | 37 +++++++++---------- .../Settings/Export/Export.messages.js | 5 ++- 5 files changed, 57 insertions(+), 39 deletions(-) diff --git a/src/components/Settings/Export/Export.component.js b/src/components/Settings/Export/Export.component.js index 2a11345fa..66e5d9a05 100644 --- a/src/components/Settings/Export/Export.component.js +++ b/src/components/Settings/Export/Export.component.js @@ -18,6 +18,7 @@ import FullScreenDialog from '../../UI/FullScreenDialog'; import messages from './Export.messages'; import './Export.css'; +import ListSubheader from '@material-ui/core/ListSubheader'; const propTypes = { /** @@ -39,7 +40,7 @@ class Export extends React.Component { this.state = { exportSingleBoard: '', exportAllBoard: '', - exportAllBoardSize: '16', + labelFontSize: '12', singleBoard: '', loadingSingle: false, loadingAll: false, @@ -65,7 +66,7 @@ class Export extends React.Component { handleSizeChange = event => { this.setState({ boardError: false, - exportAllBoardSize: event.target.value + labelFontSize: event.target.value }); }; @@ -85,7 +86,7 @@ class Export extends React.Component { this.props.onExportClick( this.state.exportAllBoard, '', - this.state.exportAllBoardSize, + this.state.labelFontSize, doneCallback ); } @@ -114,7 +115,7 @@ class Export extends React.Component { this.props.onExportClick( this.state.exportSingleBoard, this.state.singleBoard, - this.state.exportAllBoardSize, + this.state.labelFontSize, doneCallback ); } @@ -130,7 +131,7 @@ class Export extends React.Component { title={} onClose={onClose} > - + - + + + + + + + } + > } + primary={} secondary={} /> @@ -323,12 +334,12 @@ class Export extends React.Component { labelId="export-all-select-label-size" id="export-all-select-size" autoWidth={false} - value={this.state.exportAllBoardSize} + value={this.state.labelFontSize} onChange={this.handleSizeChange} > - Small - Medium - Large + Small + Medium + Large diff --git a/src/components/Settings/Export/Export.container.js b/src/components/Settings/Export/Export.container.js index 6dffc3e30..8d7148b3a 100644 --- a/src/components/Settings/Export/Export.container.js +++ b/src/components/Settings/Export/Export.container.js @@ -19,7 +19,7 @@ export class ExportContainer extends PureComponent { handleExportClick = async ( type = 'cboard', singleBoard = '', - exportAllBoardSize = '', + labelFontSize = '', doneCallback ) => { const exportConfig = EXPORT_CONFIG_BY_TYPE[type]; @@ -43,7 +43,7 @@ export class ExportContainer extends PureComponent { if (singleBoard) { await EXPORT_HELPERS[exportConfig.callback]( [singleBoard], - exportAllBoardSize, + labelFontSize, intl, true ); @@ -53,7 +53,7 @@ export class ExportContainer extends PureComponent { ); await EXPORT_HELPERS[exportConfig.callback]( currentBoard, - exportAllBoardSize, + labelFontSize, intl, true ); @@ -61,14 +61,14 @@ export class ExportContainer extends PureComponent { } else if (type !== 'pdf' && !singleBoard) { await EXPORT_HELPERS[exportConfig.callback]( boards, - exportAllBoardSize, + labelFontSize, intl ); } else { if (singleBoard) { await EXPORT_HELPERS[exportConfig.callback]( [singleBoard], - exportAllBoardSize, + labelFontSize, intl ); } else { @@ -77,7 +77,7 @@ export class ExportContainer extends PureComponent { ); await EXPORT_HELPERS[exportConfig.callback]( currentBoard, - exportAllBoardSize, + labelFontSize, intl ); } diff --git a/src/components/Settings/Export/Export.css b/src/components/Settings/Export/Export.css index 4e0b0e461..0366fa48e 100644 --- a/src/components/Settings/Export/Export.css +++ b/src/components/Settings/Export/Export.css @@ -19,3 +19,12 @@ .Export__SelectContainer--spinner { vertical-align: middle; } + +.Export__section { + margin-bottom: 8px; +} + +.Export__List .MuiListSubheader-root { + line-height: 16px; + padding-top: 16px; +} diff --git a/src/components/Settings/Export/Export.helpers.js b/src/components/Settings/Export/Export.helpers.js index 09f11c26f..12c0f3c4c 100644 --- a/src/components/Settings/Export/Export.helpers.js +++ b/src/components/Settings/Export/Export.helpers.js @@ -377,7 +377,7 @@ async function generatePDFBoard( intl, breakPage = true, picsee = false, - exportAllBoardSize + labelFontSize ) { const header = { absolutePosition: { x: 0, y: 5 }, @@ -415,7 +415,7 @@ async function generatePDFBoard( columns, intl, picsee, - exportAllBoardSize + labelFontSize ) : await generateNonFixedBoard( board, @@ -423,7 +423,7 @@ async function generatePDFBoard( columns, intl, picsee, - exportAllBoardSize + labelFontSize ); const lastGridRowDiff = columns - grid[grid.length - 2].length; // labels row @@ -455,7 +455,7 @@ async function generateFixedBoard( columns, intl, picsee = false, - exportAllBoardSize + labelFontSize ) { let currentRow = 0; let cont = 0; @@ -512,7 +512,7 @@ async function generateFixedBoard( currentRow, pageBreak, picsee, - exportAllBoardSize + labelFontSize ); cont++; } @@ -527,7 +527,7 @@ async function generateNonFixedBoard( columns, intl, picsee = false, - exportAllBoardSize + labelFontSize ) { // Do a grid with 2n rows const grid = new Array(Math.ceil(board.tiles.length / columns) * 2); @@ -558,7 +558,7 @@ async function generateNonFixedBoard( currentRow, pageBreak, picsee, - exportAllBoardSize + labelFontSize ); }, Promise.resolve()); return grid; @@ -573,7 +573,7 @@ const addTileToGrid = async ( currentRow, pageBreak = false, picsee = false, - exportAllBoardSize + labelFontSize ) => { const { label, image } = getPDFTileData(tile, intl); const fixedRow = currentRow * 2; @@ -631,7 +631,7 @@ const addTileToGrid = async ( const labelData = { text: label, alignment: 'center', - fontSize: exportAllBoardSize, + fontSize: labelFontSize, fillColor: hexBackgroundColor, border: PDF_GRID_BORDER[labelPosition].labelData }; @@ -640,12 +640,12 @@ const addTileToGrid = async ( imageData.width = Math.min(IMG_WIDTH.column[columns], IMG_WIDTH.row[rows]); - if (imageData.width <= 37) { - labelData.fontSize = 7; - } else if (imageData.width <= 40) { - labelData.fontSize = 8; - } else if (imageData.width <= 45) { - labelData.fontSize = 9; + if (labelFontSize <= 9) { + imageData.width = 45; + } else if (labelFontSize <= 12) { + imageData.width = 40; + } else if (labelFontSize <= 16) { + imageData.width = 37; } let value1, @@ -881,7 +881,7 @@ export async function cboardExportAdapter(allBoards = [], board) { export async function pdfExportAdapter( boards = [], - exportAllBoardSize, + labelFontSize, intl, picsee = false ) { @@ -896,9 +896,6 @@ export async function pdfExportAdapter( } }; if (picsee) { - //exportAllBoardSize = exportAllBoardSize - 4; - exportAllBoardSize = - exportAllBoardSize > 20 ? exportAllBoardSize - 3 : exportAllBoardSize; docDefinition.background = function() { return { stack: [ @@ -967,7 +964,7 @@ export async function pdfExportAdapter( intl, breakPage, picsee, - exportAllBoardSize + labelFontSize ); return prevContent.concat(boardPDFData); }, Promise.resolve([])); diff --git a/src/components/Settings/Export/Export.messages.js b/src/components/Settings/Export/Export.messages.js index 6cecf9128..7a77bc697 100644 --- a/src/components/Settings/Export/Export.messages.js +++ b/src/components/Settings/Export/Export.messages.js @@ -20,11 +20,12 @@ export default defineMessages({ }, properties: { id: 'cboard.components.Settings.Export.properties', - defaultMessage: 'Settings' + defaultMessage: 'PDF Settings' }, propertiesSize: { id: 'cboard.components.Settings.Export.propertiesSize', - defaultMessage: 'General PDF settings' + defaultMessage: + 'Select the desired font size. This option is useful if you have problems with the dimensions of the exported board.' }, size: { id: 'cboard.components.Settings.Export.size', From 0429a5807f7c6810cea765c3c9365cc0da0148b1 Mon Sep 17 00:00:00 2001 From: Rodri Sanchez Date: Thu, 16 Nov 2023 17:09:17 -0300 Subject: [PATCH 3/6] Declare fontSizes constants --- src/components/Settings/Export/Export.constants.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/Settings/Export/Export.constants.js b/src/components/Settings/Export/Export.constants.js index ffb0bb917..aeb580d01 100644 --- a/src/components/Settings/Export/Export.constants.js +++ b/src/components/Settings/Export/Export.constants.js @@ -35,6 +35,9 @@ export const EMPTY_IMAGE = export const PICSEEPAL_GRID_WIDTH = 553; export const PDF_GRID_WIDTH = 800; export const PDF_BORDER_WIDTH = 2; +export const SMALL_FONT_SIZE = 9; +export const MEDIUM_FONT_SIZE = 12; +export const LARGE_FONT_SIZE = 16; export const EXPORT_CONFIG_BY_TYPE = { cboard: { From e2a1c32d088bdebdef952d9d8dbcf361933a952a Mon Sep 17 00:00:00 2001 From: Rodri Sanchez Date: Thu, 16 Nov 2023 17:10:23 -0300 Subject: [PATCH 4/6] Update export messages --- .../Settings/Export/Export.component.js | 29 ++++++++++---- .../Settings/Export/Export.messages.js | 38 ++++++++++++------- src/translations/src/cboard.json | 6 +++ 3 files changed, 52 insertions(+), 21 deletions(-) diff --git a/src/components/Settings/Export/Export.component.js b/src/components/Settings/Export/Export.component.js index 66e5d9a05..81704faf4 100644 --- a/src/components/Settings/Export/Export.component.js +++ b/src/components/Settings/Export/Export.component.js @@ -19,6 +19,11 @@ import messages from './Export.messages'; import './Export.css'; import ListSubheader from '@material-ui/core/ListSubheader'; +import { + LARGE_FONT_SIZE, + MEDIUM_FONT_SIZE, + SMALL_FONT_SIZE +} from './Export.constants'; const propTypes = { /** @@ -40,7 +45,7 @@ class Export extends React.Component { this.state = { exportSingleBoard: '', exportAllBoard: '', - labelFontSize: '12', + labelFontSize: MEDIUM_FONT_SIZE, singleBoard: '', loadingSingle: false, loadingAll: false, @@ -304,15 +309,17 @@ class Export extends React.Component { className="Export__List" subheader={ - + } > } - secondary={} + primary={} + secondary={ + + } />
@@ -328,7 +335,7 @@ class Export extends React.Component { variant="standard" > - {intl.formatMessage(messages.size)} + {intl.formatMessage(messages.fontSize)}
diff --git a/src/components/Settings/Export/Export.messages.js b/src/components/Settings/Export/Export.messages.js index 7a77bc697..eafbea065 100644 --- a/src/components/Settings/Export/Export.messages.js +++ b/src/components/Settings/Export/Export.messages.js @@ -18,19 +18,6 @@ export default defineMessages({ id: 'cboard.components.Settings.Export.exportAll', defaultMessage: 'Export All Boards' }, - properties: { - id: 'cboard.components.Settings.Export.properties', - defaultMessage: 'PDF Settings' - }, - propertiesSize: { - id: 'cboard.components.Settings.Export.propertiesSize', - defaultMessage: - 'Select the desired font size. This option is useful if you have problems with the dimensions of the exported board.' - }, - size: { - id: 'cboard.components.Settings.Export.size', - defaultMessage: 'Font size' - }, exportAllSecondary: { id: 'cboard.components.Settings.Export.exportAllSecondary', defaultMessage: @@ -61,5 +48,30 @@ export default defineMessages({ downloadNoConnectionError: { id: 'cboard.components.Settings.Export.downloadNoConnectionError', defaultMessage: 'Need internet connection to download the PDF.' + }, + pdfSettings: { + id: 'cboard.components.Settings.Export.pdfSettings', + defaultMessage: 'PDF Settings' + }, + fontSize: { + id: 'cboard.components.Settings.Export.fontSize', + defaultMessage: 'Font size' + }, + fontSizeSecondary: { + id: 'cboard.components.Settings.Export.fontSizeSecondary', + defaultMessage: + 'Select the desired font size. This option is useful if you have problems with the dimensions of the exported board.' + }, + small: { + id: 'cboard.components.Settings.Export.small', + defaultMessage: 'Small' + }, + medium: { + id: 'cboard.components.Settings.Export.medium', + defaultMessage: 'Medium' + }, + large: { + id: 'cboard.components.Settings.Export.large', + defaultMessage: 'Large' } }); diff --git a/src/translations/src/cboard.json b/src/translations/src/cboard.json index 23ef08c15..e06cd7731 100644 --- a/src/translations/src/cboard.json +++ b/src/translations/src/cboard.json @@ -446,6 +446,12 @@ "cboard.components.Settings.Export.boardDownloadedError": "Ups..Something went wrong. Please try again", "cboard.components.Settings.Export.downloadNoConnectionError": "Need internet connection to download the PDF.", "cboard.components.Settings.Export.boards": "Boards", + "cboard.components.Settings.Export.pdfSettings": "PDF Settings", + "cboard.components.Settings.Export.fontSize": "Font size", + "cboard.components.Settings.Export.fontSizeSecondary": "Select the desired font size. This option is useful if you have problems with the dimensions of the exported board.", + "cboard.components.Settings.Export.small": "Small", + "cboard.components.Settings.Export.medium": "Medium", + "cboard.components.Settings.Export.large": "Large", "cboard.components.Settings.Import.import": "Import", "cboard.components.Settings.Import.importSecondary": "This option will import JUST the new boards detected. It WILL NOT import the default boards included on Cboard. Supported formats are {cboardLink} format or {link} format.", "cboard.components.Settings.Import.success": "Success!! {boards} boards were imported successfully.", From 4d0308df6263868201af33ee5c41a6035f61ae25 Mon Sep 17 00:00:00 2001 From: Rodri Sanchez Date: Thu, 16 Nov 2023 17:11:15 -0300 Subject: [PATCH 5/6] Fix label font size on large grids --- .../Settings/Export/Export.helpers.js | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/components/Settings/Export/Export.helpers.js b/src/components/Settings/Export/Export.helpers.js index 12c0f3c4c..1a61a3726 100644 --- a/src/components/Settings/Export/Export.helpers.js +++ b/src/components/Settings/Export/Export.helpers.js @@ -20,7 +20,9 @@ import { PDF_GRID_WIDTH, PDF_BORDER_WIDTH, PICSEEPAL_IMAGES_WIDTH, - PDF_IMAGES_WIDTH + PDF_IMAGES_WIDTH, + SMALL_FONT_SIZE, + MEDIUM_FONT_SIZE } from './Export.constants'; import { LABEL_POSITION_ABOVE, @@ -640,12 +642,19 @@ const addTileToGrid = async ( imageData.width = Math.min(IMG_WIDTH.column[columns], IMG_WIDTH.row[rows]); - if (labelFontSize <= 9) { - imageData.width = 45; - } else if (labelFontSize <= 12) { - imageData.width = 40; - } else if (labelFontSize <= 16) { - imageData.width = 37; + if (imageData.width <= 45) { + if (imageData.width <= 37) { + labelData.fontSize = 7; + } else if (imageData.width <= 40) { + labelData.fontSize = 8; + } else if (imageData.width <= 45) { + labelData.fontSize = 9; + } + + if (labelFontSize === SMALL_FONT_SIZE) + labelData.fontSize = labelData.fontSize - 2; + if (labelFontSize === MEDIUM_FONT_SIZE) + labelData.fontSize = labelData.fontSize + 2; } let value1, From 7c6f7ba1cc6697663132835a978dc2af06fb5f3f Mon Sep 17 00:00:00 2001 From: Rodri Sanchez Date: Thu, 16 Nov 2023 18:13:17 -0300 Subject: [PATCH 6/6] Small fix --- src/components/Settings/Export/Export.helpers.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Settings/Export/Export.helpers.js b/src/components/Settings/Export/Export.helpers.js index 1a61a3726..c64140545 100644 --- a/src/components/Settings/Export/Export.helpers.js +++ b/src/components/Settings/Export/Export.helpers.js @@ -22,7 +22,7 @@ import { PICSEEPAL_IMAGES_WIDTH, PDF_IMAGES_WIDTH, SMALL_FONT_SIZE, - MEDIUM_FONT_SIZE + LARGE_FONT_SIZE } from './Export.constants'; import { LABEL_POSITION_ABOVE, @@ -653,7 +653,7 @@ const addTileToGrid = async ( if (labelFontSize === SMALL_FONT_SIZE) labelData.fontSize = labelData.fontSize - 2; - if (labelFontSize === MEDIUM_FONT_SIZE) + if (labelFontSize === LARGE_FONT_SIZE) labelData.fontSize = labelData.fontSize + 2; }