Skip to content

Fix OBF export not respecting grid size for fixed boards (#1772) #2053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix OBF export not respecting grid size for fixed boards (#1772) #2053

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/components/Settings/Export/Export.helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,21 +143,24 @@ async function boardToOBF(boardsMap, board = {}, intl, { embed = false }) {
if (!board.tiles || board.tiles.length < 1) {
return { obf: null, images: null };
}
const columns =
board.isFixed && board.grid ? board.grid.columns : CBOARD_COLUMNS;

const images = {};
const fetchedImages = {};
const grid = new Array(Math.ceil(board.tiles.length / CBOARD_COLUMNS));
const grid = board.isFixed
? board.grid.order
: new Array(Math.ceil(board.tiles.length / columns));
let currentRow = 0;
const buttons = await Promise.all(
board.tiles.map(async (tile, i) => {
currentRow =
i >= (currentRow + 1) * CBOARD_COLUMNS ? currentRow + 1 : currentRow;
i >= (currentRow + 1) * columns ? currentRow + 1 : currentRow;

if (tile) {
if (grid[currentRow]) {
if (!board.isFixed) {
grid[currentRow] = grid[currentRow] || [];
grid[currentRow].push(tile.id);
} else {
grid[currentRow] = [tile.id];
}

const button = {
Expand Down Expand Up @@ -227,7 +230,7 @@ async function boardToOBF(boardsMap, board = {}, intl, { embed = false }) {
);

if (grid.length >= 1) {
const lastGridRowDiff = CBOARD_COLUMNS - grid[grid.length - 1].length;
const lastGridRowDiff = columns - grid[grid.length - 1].length;
if (lastGridRowDiff > 0) {
const emptyButtons = new Array(lastGridRowDiff).map(() => null);
grid[grid.length - 1] = grid[grid.length - 1].concat(emptyButtons);
Expand All @@ -245,7 +248,7 @@ async function boardToOBF(boardsMap, board = {}, intl, { embed = false }) {
sounds: [],
grid: {
rows: grid.length,
columns: CBOARD_COLUMNS,
columns: columns,
order: grid
},
description_html: board.nameKey
Expand Down