* fix style bugs * fix select styles * test: fix font size issue for cypress tests * incorporate ashit feedback * test: addresed review comments for cypress tests * add analytics events * height issue in view mode * incorporate code review feedbacks * incorporate code review feedbacks * refactor: addressed review comments; removed border radius and box shadow for text widget; Updated migrations * feat: Makes shadow and radius controls keyboard accessible (#11547) * makes shadow and radius controls keyboard accessible * removes unused imports * moves options out of render method * fix: changed the misnomer background property name to the relevant property name * fix: border radius issue for the map widget * address qa bugs * address qa bugs * fix ux of theming pane when widget is selected * fix: * added backgroundColor to the video widget * restricted pop-over border radius to 0.375rem * added box shadow for the input group for select widget * fix: added delete icon in the delete theme modal * address qa bugs * change checkbox column size in config * add js convertible to button color * remove unused imports * test: fixed jest tests * fix primary color typo * fix: migrations for the theming * fix: * Removed background color from MultiTreeSelect and TreeSelect component. * grouped button's menu button pop over border radius restricting to 0.375rem. * test: updated Dsl migration UT * address qa bugs * address qa bugs * fix: address qa comments * address qa bugs * fix: * migration issue; * unit test cases; * fix rating widget scroll issue * fix youtube video border radius bug * fix select widget * fix select widgets styles * address qa bugs * merge conflicts * makes the reset button keyboard accessible (#12134) * -resolved merge conflicts * address qa bugs * fix: labelTextSize migration fixes * refactor: * made changes to the fontSizeUtils function * fixed the issue related to unit tests * fix button group widget * remove unused imports * fix: fixed the text size migration for the table widget * refactor: addressed review comments for the table widget theming migration * fix button group widget * add init calls for view mode * json form init theme changes * fix: added migration for boxShadow, borderRadius and textSizes for table widget * fix broken fields * test: fixed unit tests * wip * inconsistancy fixes and schemaItem update in updateHook/fieldConfiguration * feat: init json form migration theming * json form primaryColor -> accentColor * update table widget * update table widget * object field label styling * fix: migration related to the JSON form * fix: fixed labelTextSize migration for JSON form nested widgets * property control nested stylesheet lookup * JSONForm label styles form array items * show label for checkbox field array item * fix button group widget * wip * refactor: addressed table widget review comments * refactor: addressed ashit review comments; * added childStylesheet for widgets * feat: Keyboard navigable Color Picker control (#11797) * Makes ColorPicker keyboard accessible * seperate out keyboard and mouse interactions * fix issue with not focusing back to input * Adds test for Color picker * chore: added comment for the boxShadow property * fix: * added unit test cases for the widget and property utils * resolved warning messages * wip * theme config update * fix merge conflicts * refactor: moved theming migration inside the migrations folder * fix qa bugs * fix jest test * fix: unit test cases * fix table column creation logic * refactor: addressed review comments for migrations * fix: Overriding margin and padding for custom render in the dropdown component (#12875) * * fix for custom render padding and margin in ADS dropdown * * fix for removing padding from normal render options * refactor: moved the boxShadow condition to the variable * fix qa bugs * fix: migration QA callouts for audio recorder widget * refactor: added updated comments for boxShadow migration for table widget * fix theme binfings for JSONForm fields under Object * fix table widget theming bug * fix: addressed code review comments * fix: unit test cases * fix: qa migration callouts * fix table widget theming bug * fix JSONForm currency input dropdown not submit form * Added new tests - AppThemingSpec * fix qa bugs * fix unit test * fix JSONForm cellBorderWidth to have default value post migration * fix unit test * fix qa bugs * remove unused imports * fix qa bugs * fix JSONForm input height issue * fix qa bugs * Updating Theming spec * * dropdown color fixes (#13249) * fix caching issue ; * Fixed Theming tests * fix tests * fix tab widget tests * fix: json form children level migration issue * fix table widget tests * Updated test * updated tests * updated test * updated tests * updated tests * updated pageload * fix cypress tests * remove cypress created files * fix color picker issues * Failure fixes * Fixed some more tests * fix: cypress test failures * fix tests * remove consoles * fix table tests * fix qa bugs * updating snapshots for AppPageLayout_spec as per new UI * fix rating widget bug * fix qa bugs * fix: * cypress failing tests * Migration QA callouts * Removed unused imports * update constract check algo * fix color contrast issue * fix: cypress failure test cases * update font sizes labels * fix regression bugs * fix: * JSON form labelTextSize issue fix * Updated comment for the fontSizeUtility function * migrations issues related to table widget borderRadius and boxShadow * fix: default labelTextSize issue for the Input and Select families * fix regression bugs * fix regression bugs * PassingParams spec - added wait time * fix: font family default value issue on JS toggle * fix js toggle issue in text widget * fix tests * fix tests * fix tests * fix cypress tests * fix regression bugs * fix regression bugs * fix: * refactored table widget migration function as per review comments, * added default value to the widget * fix: failing unit test cases * fix theming spec * fix cypress tests * test: fixed failed cypress test * incorporate ashit feedback * fix cypress tests * fix: addressed review comments * comment out table cypress test * fix merge conflicts * comment out color picker tests Co-authored-by: Pawan Kumar <pawankumar@Pawans-MacBook-Pro.local> Co-authored-by: keyurparalkar <keyur@appsmith.com> Co-authored-by: Aswath K <aswath@appsmith.com> Co-authored-by: Nayan <nayan@appsmith.com> Co-authored-by: Ashit Rath <ashit@appsmith.com> Co-authored-by: balajisoundar <balaji@appsmith.com> Co-authored-by: albinAppsmith <87797149+albinAppsmith@users.noreply.github.com> Co-authored-by: Aishwarya UR <aishwarya@appsmith.com> Co-authored-by: apple <nandan@thinkify.io> Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
257 lines
6.7 KiB
TypeScript
257 lines
6.7 KiB
TypeScript
import React, { useCallback, useMemo, useRef, useState } from "react";
|
|
import { DraftHandleValue, EditorState } from "draft-js";
|
|
import Editor from "@draft-js-plugins/editor";
|
|
import ProfileImage, { Profile } from "pages/common/ProfileImage";
|
|
|
|
import createMentionPlugin, { MentionData } from "@draft-js-plugins/mention";
|
|
import styled from "styled-components";
|
|
|
|
import "@draft-js-plugins/mention/lib/plugin.css";
|
|
import "draft-js/dist/Draft.css";
|
|
import { getTypographyByKey } from "constants/DefaultTheme";
|
|
import { EntryComponentProps } from "@draft-js-plugins/mention/lib/MentionSuggestions/Entry/Entry";
|
|
|
|
import Icon from "components/ads/Icon";
|
|
|
|
import { INVITE_A_NEW_USER, createMessage } from "@appsmith/constants/messages";
|
|
import { USER_PHOTO_URL } from "constants/userConstants";
|
|
|
|
import scrollIntoView from "scroll-into-view-if-needed";
|
|
import { useEffect } from "react";
|
|
|
|
const StyledMention = styled.span`
|
|
color: ${(props) => props.theme.colors.comments.mention};
|
|
`;
|
|
|
|
export function MentionComponent(props: {
|
|
children: React.ReactNode;
|
|
entityKey: string;
|
|
}) {
|
|
const { children } = props;
|
|
return <StyledMention>@{children}</StyledMention>;
|
|
}
|
|
|
|
export enum Trigger {
|
|
"@" = "@",
|
|
"+" = "+",
|
|
}
|
|
|
|
const StyledSuggestionsComponent = styled.div<{ isFocused?: boolean }>`
|
|
display: flex;
|
|
width: 250px;
|
|
padding: ${(props) =>
|
|
`${props.theme.spaces[4]}px ${props.theme.spaces[6]}px`};
|
|
|
|
& ${Profile} {
|
|
margin-right: ${(props) => props.theme.spaces[4]}px;
|
|
}
|
|
align-items: center;
|
|
|
|
&:hover {
|
|
background-color: ${(props) => props.theme.colors.mentionSuggestion.hover};
|
|
}
|
|
|
|
${(props) =>
|
|
props.isFocused
|
|
? `
|
|
background-color: ${props.theme.colors.mentionSuggestion.hover};
|
|
`
|
|
: ""}
|
|
`;
|
|
|
|
const Name = styled.div`
|
|
${(props) => getTypographyByKey(props, "h5")}
|
|
color: ${(props) => props.theme.colors.mentionSuggestion.nameText};
|
|
overflow: hidden;
|
|
text-overflow: ellipsis;
|
|
white-space: pre;
|
|
`;
|
|
|
|
const Username = styled.div`
|
|
${(props) => getTypographyByKey(props, "p3")}
|
|
color: ${(props) => props.theme.colors.mentionSuggestion.usernameText};
|
|
overflow: hidden;
|
|
text-overflow: ellipsis;
|
|
white-space: pre;
|
|
`;
|
|
|
|
const PlusCircle = styled.div`
|
|
width: 25px;
|
|
height: 25px;
|
|
display: flex;
|
|
border-radius: 50%;
|
|
align-items: center;
|
|
justify-content: center;
|
|
background-color: ${(props) =>
|
|
props.theme.colors.mentionsInput.mentionsInviteBtnPlusIcon};
|
|
& svg path {
|
|
stroke: #fff;
|
|
}
|
|
margin-right: ${(props) => props.theme.spaces[4]}px;
|
|
flex-shrink: 0;
|
|
`;
|
|
|
|
const SuggestionRightContainer = styled.div`
|
|
flex: 1;
|
|
min-width: 0;
|
|
`;
|
|
|
|
function SuggestionComponent(props: EntryComponentProps) {
|
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
const { theme, ...parentProps } = props;
|
|
const { user } = props.mention;
|
|
const mentionRef = useRef<HTMLDivElement | null>(null);
|
|
|
|
useEffect(() => {
|
|
if (parentProps.isFocused && mentionRef.current) {
|
|
scrollIntoView(mentionRef.current, {
|
|
scrollMode: "if-needed",
|
|
behavior: "smooth",
|
|
block: "nearest",
|
|
inline: "nearest",
|
|
});
|
|
}
|
|
}, [parentProps.isFocused]);
|
|
|
|
if (props.mention?.isInviteTrigger) {
|
|
return (
|
|
<StyledSuggestionsComponent ref={mentionRef} {...parentProps}>
|
|
<PlusCircle>
|
|
<Icon fillColor="#fff" name="plus" />
|
|
</PlusCircle>
|
|
<SuggestionRightContainer>
|
|
<Name>{createMessage(INVITE_A_NEW_USER)}</Name>
|
|
<Username>{props.mention.name}</Username>
|
|
</SuggestionRightContainer>
|
|
</StyledSuggestionsComponent>
|
|
);
|
|
}
|
|
|
|
return (
|
|
<StyledSuggestionsComponent ref={mentionRef} {...parentProps}>
|
|
<div style={{ flexShrink: 0 }}>
|
|
<ProfileImage
|
|
size={25}
|
|
source={`/api/${USER_PHOTO_URL}/${user?.username}`}
|
|
userName={user?.username || ""}
|
|
/>
|
|
</div>
|
|
<SuggestionRightContainer>
|
|
<Name>{props.mention.name}</Name>
|
|
<Username>{user?.username}</Username>
|
|
</SuggestionRightContainer>
|
|
</StyledSuggestionsComponent>
|
|
);
|
|
}
|
|
|
|
const StyledContainer = styled.div`
|
|
overflow: auto;
|
|
flex: 1;
|
|
|
|
.mentions-list {
|
|
position: absolute;
|
|
background: #fff;
|
|
border-radius: 2px;
|
|
box-shadow: 0px 4px 30px 0px rgb(220 220 220);
|
|
cursor: pointer;
|
|
display: flex;
|
|
flex-direction: column;
|
|
overflow: auto;
|
|
max-height: 300px;
|
|
z-index: 2;
|
|
}
|
|
`;
|
|
|
|
type Props = {
|
|
suggestions: Array<MentionData>;
|
|
onSubmit: (editorState: EditorState) => void;
|
|
editorState: EditorState;
|
|
setEditorState: (editorState: EditorState) => void;
|
|
readOnly?: boolean;
|
|
onSearchSuggestions: (props: { value: string; trigger: string }) => void;
|
|
autoFocus: boolean;
|
|
placeholder?: string;
|
|
onAddMention?: (mention: MentionData) => void;
|
|
};
|
|
|
|
function MentionsInput({
|
|
autoFocus,
|
|
editorState,
|
|
onAddMention,
|
|
onSearchSuggestions,
|
|
onSubmit,
|
|
placeholder,
|
|
setEditorState,
|
|
suggestions,
|
|
}: Props) {
|
|
const ref = useRef<Editor | null>(null);
|
|
const [open, setOpen] = useState(false);
|
|
const { MentionSuggestions, plugins } = useMemo(() => {
|
|
const mentionPlugin = createMentionPlugin({
|
|
mentionRegExp: "[\\w@\\._]",
|
|
mentionTrigger: ["@", "+"],
|
|
mentionComponent: MentionComponent,
|
|
theme: {
|
|
mentionSuggestions: "mentions-list",
|
|
},
|
|
});
|
|
const { MentionSuggestions } = mentionPlugin;
|
|
return { plugins: [mentionPlugin], MentionSuggestions };
|
|
}, []);
|
|
|
|
const onOpenChange = useCallback((_open: boolean) => {
|
|
setOpen(_open);
|
|
}, []);
|
|
|
|
const handleReturn = useCallback(
|
|
(e: React.KeyboardEvent, editorState: EditorState): DraftHandleValue => {
|
|
if (!e.nativeEvent.shiftKey && !open) {
|
|
onSubmit(editorState);
|
|
return "handled";
|
|
}
|
|
return "not-handled";
|
|
},
|
|
[open],
|
|
);
|
|
|
|
const focusInput = useCallback(() => {
|
|
// Forcing focus breaks plugins
|
|
// Ref: https://github.com/draft-js-plugins/draft-js-plugins/issues/800
|
|
setTimeout(() => ref.current?.focus());
|
|
}, []);
|
|
|
|
const setRef = useCallback((editorRef) => {
|
|
ref.current = editorRef;
|
|
if (autoFocus) focusInput();
|
|
}, []);
|
|
|
|
return (
|
|
<StyledContainer onClick={focusInput}>
|
|
<Editor
|
|
editorKey={"editor"}
|
|
editorState={editorState}
|
|
handleReturn={handleReturn}
|
|
onChange={setEditorState}
|
|
placeholder={placeholder}
|
|
plugins={plugins}
|
|
ref={setRef}
|
|
webDriverTestID="mentions-input"
|
|
/>
|
|
<MentionSuggestions
|
|
entryComponent={SuggestionComponent}
|
|
onAddMention={(mention: MentionData) => {
|
|
if (onAddMention) {
|
|
onAddMention(mention);
|
|
}
|
|
}}
|
|
onOpenChange={onOpenChange}
|
|
onSearchChange={onSearchSuggestions}
|
|
open={open}
|
|
suggestions={suggestions}
|
|
/>
|
|
</StyledContainer>
|
|
);
|
|
}
|
|
|
|
export default MentionsInput;
|