Skip to content

Commit 699b409

Browse files
committed
feat: update image lightbox
1 parent 02a9ad2 commit 699b409

File tree

11 files changed

+42
-1
lines changed

11 files changed

+42
-1
lines changed

src/Comment/body/comment.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@ class Comment extends PureComponent {
8181
});
8282
};
8383

84+
setImageIndex = (index) => {
85+
this.setState({ largeImageIndex: index });
86+
};
87+
8488
isCommentUserExist = (commentItem) => {
8589
const { collaborators } = this.props;
8690
return !!collaborators.find(collaborator => collaborator.email === commentItem.author);
@@ -167,6 +171,7 @@ class Comment extends PureComponent {
167171
closeImagePopup={this.hideLargeImage}
168172
moveToPrevImage={this.movePrev}
169173
moveToNextImage={this.moveNext}
174+
setImageIndex={this.setImageIndex}
170175
/>
171176
)}
172177
</div>

src/Comment/footer/input/index.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,10 @@ class Input extends React.Component {
376376
this.onSelectCollaborator(filteredCollaborators[activeCollaboratorIndex]);
377377
};
378378

379+
setImageIndex = (index) => {
380+
this.setState({ largeImageIndex: index });
381+
};
382+
379383
render() {
380384
const { api } = this.props;
381385
const { imageUrlList, largeImageIndex, filteredCollaborators, activeCollaboratorIndex } = this.state;
@@ -421,6 +425,7 @@ class Input extends React.Component {
421425
closeImagePopup={this.hideLargeImage}
422426
moveToPrevImage={this.movePrev}
423427
moveToNextImage={this.moveNext}
428+
setImageIndex={this.setImageIndex}
424429
/>
425430
}
426431
<FileUploader

src/FileEditor/files-previewer/pc-previewer/index.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ class PCFilesPreviewer extends React.Component {
165165
this.onChangeSelectMultipleFiles(false);
166166
};
167167

168+
setImageIndex = (index) => {
169+
this.setState({ largeImageIndex: index });
170+
};
171+
168172
renderFilesOperation = () => {
169173
const { value, deleteFiles, getDownLoadFiles } = this.props;
170174
const { isSelectMultipleFiles, selectedFilesList } = this.state;
@@ -238,6 +242,7 @@ class PCFilesPreviewer extends React.Component {
238242
deleteImage={this.deleteImage}
239243
downloadImage={this.downloadImage}
240244
onRotateImage={this.onRotateImage}
245+
setImageIndex={this.setImageIndex}
241246
/>
242247
}
243248
<DTableCommonAddTool className="dtable-ui-file-editor-previewer-add-btn" callBack={this.togglePreviewer} footerName={getLocale('Add_files')} />

src/FileFormatter/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ const FileFormatter = ({
108108
closeImagePopup={hideLargeImage}
109109
moveToPrevImage={movePrev}
110110
moveToNextImage={moveNext}
111+
setImageIndex={setLargeImageIndex}
111112
/>
112113
)}
113114
</div>

src/ImageEditor/images-previewer/index.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ class ImagesPreviewer extends React.Component {
7171
}));
7272
};
7373

74+
setImageIndex = (index) => {
75+
this.setState({ largeImageIndex: index });
76+
};
77+
7478
togglePreviewer = () => {
7579
this.props.togglePreviewer(FILE_EDITOR_STATUS.ADDITION);
7680
this.props.resetAdditionImage();
@@ -135,6 +139,7 @@ class ImagesPreviewer extends React.Component {
135139
deleteImage={this.props.deleteImage ? this.deleteImage : null}
136140
downloadImage={this.downloadImage}
137141
onRotateImage={this.props.onRotateImage}
142+
setImageIndex={this.setImageIndex}
138143
/>
139144
)}
140145
<DTableCommonAddTool callBack={this.togglePreviewer} footerName={getLocale('Add_images')} />

src/ImageEditor/pc-editor/images-previewer/index.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ class ImagesPreviewer extends React.Component {
7070
}));
7171
};
7272

73+
setImageIndex = (index) => {
74+
this.setState({ largeImageIndex: index });
75+
};
76+
7377
togglePreviewer = () => {
7478
this.props.togglePreviewer(FILE_EDITOR_STATUS.ADDITION);
7579
this.props.resetAdditionImage();
@@ -134,6 +138,7 @@ class ImagesPreviewer extends React.Component {
134138
deleteImage={this.props.deleteImage ? this.deleteImage : null}
135139
downloadImage={this.downloadImage}
136140
onRotateImage={this.props.onRotateImage}
141+
setImageIndex={this.setImageIndex}
137142
/>
138143
)}
139144
<DTableCommonAddTool callBack={this.togglePreviewer} footerName={getLocale('Add_images')} />

src/ImageFormatter/index.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ class ImageFormatter extends React.Component {
5555
}));
5656
};
5757

58+
setImageIndex = (index) => {
59+
this.setState({ previewImageIndex: index });
60+
};
61+
5862
downloadImage = (imageItemUrl) => {
5963
if (!this.props.downloadImage) return;
6064
this.props.downloadImage(imageItemUrl);
@@ -97,6 +101,7 @@ class ImageFormatter extends React.Component {
97101
imageItems={value}
98102
className={lightboxClassName}
99103
imageIndex={previewImageIndex}
104+
setImageIndex={this.setImageIndex}
100105
closeImagePopup={this.closeImagePopup}
101106
moveToPrevImage={this.movePrev}
102107
moveToNextImage={this.moveNext}

src/ImagePreviewerLightbox/index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import './index.css';
1111
function ImagePreviewerLightbox(props) {
1212
const {
1313
imageItems, imageIndex, readOnly, className, server, workspaceID, dtableUuid,
14-
deleteImage, downloadImage, onRotateImage,
14+
deleteImage, downloadImage, onRotateImage, setImageIndex
1515
} = props;
1616
const imageSrcList = imageItems.map((src) => {
1717
if (server && dtableUuid && isCustomAssetUrl(src)) {
@@ -55,6 +55,9 @@ function ImagePreviewerLightbox(props) {
5555

5656
return (
5757
<Lightbox
58+
imageItems={imageSrcList}
59+
currentIndex={imageIndex}
60+
setImageIndex={setImageIndex}
5861
wrapperClassName={classnames('dtable-ui-component', className)}
5962
imageTitle={imageTitleDOM}
6063
mainSrc={mainSrc}

src/RowExpandEditor/digital-sign-editor/pc-editor/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ class RowExpandPCDigitalSignEditor extends React.Component {
180180
deleteImage={(index) => {
181181
this.deleteImage(index); this.hideLargeImage();
182182
}}
183+
setImageIndex={this.setLargeImageIndex}
183184
/>
184185
}
185186
</div>

src/RowExpandEditor/image-editor/pc-editor/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ class RowExpandPCImageEditor extends React.Component {
158158
closeImagePopup={this.hideLargeImage}
159159
moveToPrevImage={this.moveToPrevImage}
160160
moveToNextImage={this.moveToNextImage}
161+
setImageIndex={this.setLargeImageIndex}
161162
/>
162163
}
163164
</>

0 commit comments

Comments
 (0)