Skip to content
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

fixing in 200% zoom mode, Content which is present in the dialog is not visible #605

Merged
merged 1 commit into from
Jan 16, 2024
Merged

fixing in 200% zoom mode, Content which is present in the dialog is not visible #605

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
24 changes: 7 additions & 17 deletions RetrospectiveExtension.Frontend/components/feedbackItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class FeedbackItem extends React.Component<IFeedbackItemProps, IFeedbackItemStat
reflectBackendService.removeOnReceiveDeletedItem(this.receiveDeletedItemHandler);
}

private receiveDeletedItemHandler = async (columnId: string, feedbackItemId: string) => {
private receiveDeletedItemHandler = (columnId: string, feedbackItemId: string) => {
if (feedbackItemId === this.props.id && !this.state.isMarkedForDeletion) {
this.markFeedbackItemForDelete();
}
Expand Down Expand Up @@ -247,8 +247,8 @@ class FeedbackItem extends React.Component<IFeedbackItemProps, IFeedbackItemStat
});
}

private onConfirmRemoveFeedbackItemFromGroup = async () => {
await this.props.moveFeedbackItem(
private onConfirmRemoveFeedbackItemFromGroup = () => {
this.props.moveFeedbackItem(
this.props.refreshFeedbackItems,
this.props.boardId,
this.props.id,
Expand All @@ -271,7 +271,7 @@ class FeedbackItem extends React.Component<IFeedbackItemProps, IFeedbackItemStat
}

private markFeedbackItemForDelete = (isLocalDelete: boolean = false) => {
if (this.props.groupedItemProps && this.props.groupedItemProps.isMainItem && this.props.groupedItemProps.isGroupExpanded) {
if (this.props.groupedItemProps?.isMainItem && this.props.groupedItemProps?.isGroupExpanded) {
this.props.groupedItemProps.toggleGroupExpand();
}

Expand Down Expand Up @@ -317,12 +317,6 @@ class FeedbackItem extends React.Component<IFeedbackItemProps, IFeedbackItemStat
}
}

private showMobileFeedbackItemActionsDialog = () => {
this.setState({
isMobileFeedbackItemActionsDialogHidden: false,
});
}

private hideMobileFeedbackItemActionsDialog = () => {
this.setState({
isMobileFeedbackItemActionsDialogHidden: true,
Expand Down Expand Up @@ -566,8 +560,7 @@ class FeedbackItem extends React.Component<IFeedbackItemProps, IFeedbackItemStat
private pressSearchedFeedbackItem = (event: React.KeyboardEvent<HTMLDivElement>, feedbackItemProps: IFeedbackItemProps) => {
event.stopPropagation();

// Enter
if (event.keyCode === 13) {
if (event.key === "Enter") {
FeedbackItemHelper.handleDropFeedbackItemOnFeedbackItem(
feedbackItemProps,
this.props.id,
Expand All @@ -576,8 +569,7 @@ class FeedbackItem extends React.Component<IFeedbackItemProps, IFeedbackItemStat
this.hideGroupFeedbackItemDialog();
}

// ESC
if (event.keyCode === 27) {
if (event.key === "Escape") {
this.hideGroupFeedbackItemDialog();
}
}
Expand Down Expand Up @@ -617,7 +609,7 @@ class FeedbackItem extends React.Component<IFeedbackItemProps, IFeedbackItemStat
const isNotGroupedItem = !this.props.groupedItemProps;
const isMainItem = isNotGroupedItem || this.props.groupedItemProps.isMainItem;
const isGroupedCarouselItem = this.props.isGroupedCarouselItem;
const groupItemsCount = this.props && this.props.groupedItemProps && this.props.groupedItemProps.groupedCount + 1;
const groupItemsCount = this.props?.groupedItemProps?.groupedCount + 1;
const ariaLabel = isNotGroupedItem ? 'Feedback item.' : (!isMainItem ? 'Feedback group item.' : `Feedback group main item. Group has ${groupItemsCount} items.`);
const hideFeedbackItems = this.props.hideFeedbackItems && (this.props.userIdRef !== getUserIdentity().id);
const curTimerState = this.props.timerState;
Expand Down Expand Up @@ -1040,8 +1032,6 @@ class FeedbackItem extends React.Component<IFeedbackItemProps, IFeedbackItemStat
</Dialog>
<Dialog
hidden={this.state.isRemoveFeedbackItemFromGroupConfirmationDialogHidden}
maxWidth={700}
minWidth={700}
onDismiss={this.hideRemoveFeedbackItemFromGroupConfirmationDialog}
dialogContentProps={{
type: DialogType.close,
Expand Down
Loading