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.

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

Allows for native titles to replace Reqore popovers. #36

Merged
merged 1 commit into from
Feb 11, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@qoretechnologies/reqore",
"version": "0.2.6",
"version": "0.2.7",
"description": "ReQore is a UI library of components for Qorus connected apps",
"main": "dist/index.js",
"types": "dist/index.d.ts",
Expand Down
3 changes: 3 additions & 0 deletions src/components/Sidebar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export interface IQorusSidebarProps {
path: string;
wrapperStyle?: React.CSSProperties;
onBookmarksChange?: (bookmarks: string[]) => void;
useNativeTitle?: boolean;
}

const StyledSidebar = styled.div<{ expanded?: boolean; theme: IReqoreTheme }>`
Expand Down Expand Up @@ -312,6 +313,7 @@ const ReqoreSidebar: React.FC<IQorusSidebarProps> = ({
collapseLabel,
wrapperStyle,
onBookmarksChange,
useNativeTitle,
}) => {
const [_isCollapsed, setIsCollapsed] = useState<boolean>(
isCollapsed || false
Expand Down Expand Up @@ -389,6 +391,7 @@ const ReqoreSidebar: React.FC<IQorusSidebarProps> = ({
onUnfavoriteClick={handleUnfavoriteClick}
sectionName={sectionId}
hasFavorites={!!onBookmarksChange}
useNativeTitle={useNativeTitle}
/>
))}
</div>
Expand Down
26 changes: 26 additions & 0 deletions src/components/Sidebar/item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export interface SidebarItemProps {
currentPath: string;
sectionName: string;
hasFavorites: boolean;
useNativeTitle?: boolean;
}

export interface ISidebarTooltipProps {
Expand All @@ -37,6 +38,7 @@ export interface ISidebarTooltipProps {
isSubcategory: boolean;
isSubitem: boolean;
onClick: any;
useNativeTitle?: boolean;
}

const SidebarItemTooltip: Function = ({
Expand All @@ -47,9 +49,28 @@ const SidebarItemTooltip: Function = ({
isSubitem,
isSubcategory,
onClick,
useNativeTitle,
}: ISidebarTooltipProps) => {
const Element = itemData.as || 'div';

if (useNativeTitle) {
return (
//@ts-ignore
<Element
{...itemData.props}
onClick={itemData.props?.onClick || onClick}
className={classnames('sidebarItem', 'sidebarLink', {
sidebarSubItem: isSubitem,
active: isActive,
submenuCategory: isSubcategory,
})}
title={itemData.name}
>
{children}
</Element>
);
}

return (
//@ts-ignore
<ReqorePopover
Expand Down Expand Up @@ -85,6 +106,7 @@ const SidebarItem: Function = ({
currentPath,
sectionName,
hasFavorites,
useNativeTitle,
}: SidebarItemProps) => {
const handleFavoriteClick = (event) => {
event.persist();
Expand Down Expand Up @@ -122,6 +144,7 @@ const SidebarItem: Function = ({
itemData={itemData}
isActive={isActive}
isSubitem={subItem}
useNativeTitle={useNativeTitle}
onClick={
onSectionToggle
? () => {
Expand Down Expand Up @@ -172,6 +195,7 @@ const SidebarItemWrapper: Function = ({
onUnfavoriteClick,
hasFavorites,
sectionName,
useNativeTitle,
}: SidebarItemProps) => {
const theme: IReqoreTheme = useContext(ThemeContext);

Expand Down Expand Up @@ -222,6 +246,7 @@ const SidebarItemWrapper: Function = ({
onUnfavoriteClick={onUnfavoriteClick}
sectionName={sectionName}
hasFavorites={hasFavorites}
useNativeTitle={useNativeTitle}
/>
{expandedSection === itemData.name &&
map(itemData.submenu, (subItemData: any, key: number) => (
Expand All @@ -236,6 +261,7 @@ const SidebarItemWrapper: Function = ({
onUnfavoriteClick={onUnfavoriteClick}
sectionName={sectionName}
hasFavorites={hasFavorites}
useNativeTitle={useNativeTitle}
/>
))}
</>
Expand Down
6 changes: 6 additions & 0 deletions src/stories/Sidebar/Sidebar.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,9 @@ WithCustomColors.args = {
},
path: '/item-3/item-2',
} as IReqoreUIProviderProps & IQorusSidebarProps;

export const WithNativeTitles = Template.bind({});

WithNativeTitles.args = {
useNativeTitle: true,
} as IReqoreUIProviderProps & IQorusSidebarProps;