Skip to content

Commit 98f9a1b

Browse files
gjulivanyordan-st
authored andcommitted
fix: conflict on rebase
1 parent 962e7ce commit 98f9a1b

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

packages/pluggableWidgets/gallery-web/src/Gallery.editorPreview.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,6 @@ function Preview(props: GalleryPreviewProps): ReactElement {
3333

3434
const selectHelper = useItemSelectHelper(props.itemSelection, undefined);
3535

36-
const { numberOfColumns, numberOfRows } = useGridPositions({
37-
phoneItems: props.phoneItems ?? 1,
38-
tabletItems: props.tabletItems ?? 1,
39-
desktopItems: props.desktopItems ?? 1,
40-
totalItems: items.length
41-
});
42-
4336
const getPositionCallback = useCallback(
4437
(index: number) => getColumnAndRowBasedOnIndex(numberOfColumns, items.length, index),
4538
[numberOfColumns, items.length]
@@ -111,6 +104,7 @@ function Preview(props: GalleryPreviewProps): ReactElement {
111104
itemEventsController={itemEventsController}
112105
focusController={focusController}
113106
getPosition={getPositionCallback}
107+
showRefreshIndicator={false}
114108
preview
115109
/>
116110
</div>

packages/pluggableWidgets/gallery-web/src/features/useGridPositionsPreview.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { ObjectItem } from "mendix";
2-
import { useEffect, useState, useRef } from "react";
2+
import { useEffect, useRef, useState } from "react";
33
import { GalleryProps } from "../components/Gallery";
44

55
export type GridPositionsProps = Pick<GalleryProps<ObjectItem>, "desktopItems" | "phoneItems" | "tabletItems"> & {

0 commit comments

Comments
 (0)