2024-12-29 23:31:41 +01:00
|
|
|
import { useState, useId, useCallback, useMemo, useRef } from 'react';
|
2024-07-29 07:45:59 -07:00
|
|
|
import { useRecoilValue } from 'recoil';
|
2024-12-29 23:31:41 +01:00
|
|
|
import * as Ariakit from '@ariakit/react';
|
|
|
|
|
import { BookmarkPlusIcon } from 'lucide-react';
|
2024-08-22 17:09:05 -04:00
|
|
|
import { useQueryClient } from '@tanstack/react-query';
|
|
|
|
|
import { Constants, QueryKeys } from 'librechat-data-provider';
|
2024-07-29 07:45:59 -07:00
|
|
|
import { BookmarkFilledIcon, BookmarkIcon } from '@radix-ui/react-icons';
|
📦 feat: Move Shared Components to `@librechat/client` (#8685)
* feat: init @librechat/client
* feat: Add common types and interfaces for accessibility, agents, artifacts, assistants, and tools
* feat: Add jotai as a peer dependency
* fix build client package
* feat: cleanup unused types from common/index.ts
- Remove 104 unused type exports from packages/client/src/common/index.ts
- Keep only 7 actually used exports (93% reduction)
- Add cleanup script with enhanced import pattern detection
- Support both named imports and namespace imports (* as t)
- Create automatic backups and comprehensive documentation
- Maintain type safety with build verification
- No breaking changes to existing code
Kept exports:
- TShowToast, Option, OptionWithIcon, DropdownValueSetter
- MentionOption, NotificationSeverity, MenuItemProps
Scripts: cleanup-common-types-safe.js, README-CLEANUP.md
* fix: cleanup
* fix: package; refactor: tsconfig
* feat: add back `recoil`
* fix: move dependencies to peerDependencies in client package
* feat: add @librechat/client as a dependency in package.json and package-lock.json
* feat: update client package configuration and dependencies
- Added new dependencies for Rollup plugins and updated existing ones in package.json and package-lock.json.
- Introduced a new Rollup configuration file for building the client package.
- Refactored build scripts to include a dedicated build command for the client.
- Updated TypeScript configuration for improved module resolution and type declaration output.
- Integrated a Toast component from the client package into the main App component.
* feat: enhance Rollup configuration for client package
- Updated terser plugin settings to preserve directives like 'use client'.
- Added custom warning handler to ignore "use client" directive warnings during the build process.
* chore: rename package/client build script command
* feat: update client package dependencies and Rollup configuration
- Added rollup-plugin-postcss to package.json and updated package-lock.json.
- Enhanced Rollup configuration to include postcss plugin for CSS handling.
- Updated index.ts to export all components from the components directory for better modularity.
* feat: add client package directory to update configuration
- Included the 'client' package directory in the update.js configuration to ensure it is recognized during updates.
* feat: export Toast component in client package
- Added export for the Toast component in index.ts to enhance modularity and accessibility of components.
* feat: /client transition to @librechat/client
* chore: fixed formatting issues
* fix: update peer dependencies in @librechat/client to prevent bundling them
* fix: correct useSprings implementation in SplitText component
* fix: circular dependencies in DataTable
* fix: add remaining peer dependencies and match actual versions previously used in `client/package.json`
* fix: correct frontend:ci script to include client package build
* chore: enhance unused package detection for @librechat/client and improve dependency extraction
* fix: add missing peer dependency for @radix-ui/react-collapsible
* chore: include "packages/client" in unused i18next keys detection
* test: update AgentFooter tests to use document.querySelector for spinner checks
test: mock window.matchMedia in setupTests.js for consistent test environment
* feat: add react-hook-form dependency and update FormInput component to use its types
* chore: linting
* refactor: remove unused defaultSelectedValues prop from MCPSelect and MultiSelect components
* chore: linting
* feat: update GitHub Actions workflow to publish @librechat/client
* chore: update GitHub Actions workflow to install and build data-provider and client dependencies
* chore: add missing @testing-library/react dependency to client package
* chore: update tsconfig.json to exclude additional test files
* chore: fix build issues, resolve latest LC changes
* chore: move MCP components outside of `~/components/ui`
* feat: implement dynamic theme system with environment variable support and Tailwind CSS integration
* chore: remove unnecessary logging of sttExternal and ttsExternal in Speech component
* chore: squashed cleanup commits
chore: move @tanstack/react-virtual to dependencies and remove recoil from package.json
chore: move dependencies to peerDependencies in package.json
feat: update package.json and rollup.config.js to include jotai and enhance bundling configuration
feat: update package.json and rollup.config.js to include jotai and enhance bundling configuration
refactor: reorganize exports in index.ts for improved clarity
refactor: remove unused types and interfaces from common files
refactor: update peer dependencies and improve component typings
- Removed duplicate peer dependencies from package.json and organized them.
- Updated rollup.config.js to disable TypeScript checking during the build process.
- Modified AnimatedTabs component to use React.ReactNode for label and content types, and added TypeScript workarounds for compatibility.
- Enhanced Label and Separator components to accept an optional className prop and improved prop spreading.
- Updated Slider component to include an optional className prop and refined prop handling for better type safety.
refactor: clean up client workflow and update package dependencies
refactor: update package dependencies and improve PostCSS and Rollup configurations
chore: bump version to 0.1.2 in package.json
chore: bump client version to 0.1.2 in package-lock.json
chore: bump client version to 0.1.3 and update dependencies
chore: bump client version to 0.1.4 and update @react-spring dependencies
chore: update package version to 0.1.5 and adjust peer dependencies
- Bump version in package.json from 0.1.4 to 0.1.5.
- Update peer dependency for @tanstack/react-query to allow version 5.0.0.
- Add @tanstack/react-table and @tanstack/react-virtual as dependencies.
- Update various dependencies to their latest compatible versions.
- Simplify postcss.config.js by removing unnecessary options.
- Clean up rollup.config.js by removing ignored PostCSS warnings.
- Update CheckboxButton component to cast icon as React JSX element.
- Adjust Combobox component's class names for better styling.
- Change DropdownPopup component to use React's namespace import.
- Modify InputOTP component to use 'any' type for OTPInputContext.
- Ensure displayLabel and value in ModelParameters are converted to strings.
- Update MultiSearch component's placeholder to ensure it's a string.
- Cast selectIcon in MultiSelect as React JSX element for consistency.
- Update OGDialogTemplate to cast selectText as React JSX element.
- Initialize animationRef in PixelCard with undefined for clarity.
- Add TypeScript ignore comments in Select and SelectDropDown components for Radix UI type conflicts.
- Ensure title in SelectDropDown is a string and adjust rendering of options.
- Update useLocalize hook to cast options as any for compatibility.
refactor: code structure; chore: translations cleanup
chore: remove unused imports and clean up code in NewChat component
refactor: enhance Menu component to support custom render functions for menu items
style: update itemClassName in ToolsDropdown for improved UI consistency
fix: merge conflicts
chore: update @radix-ui/react-accordion to version 1.2.11
* refactor: remove unnecessary TypeScript type assertions in AnimatedTabs, Label, Separator, and Slider components
* feat: enhance theme system with localStorage persistence and new theme atoms
* chore: bump version of @librechat/client to 0.1.7
* chore: fix ci/cd warnings/errors related to linting and unused localization keys
* chore: update dependencies for class-variance-authority, clsx, and match-sorter
* chore: bump @librechat/client to v0.1.8
* feat: add utility colors for theme customization and remove unused tailwindConfig
* v0.1.9
---------
Co-authored-by: Marco Beretta <81851188+berry-13@users.noreply.github.com>
2025-07-27 12:19:01 -04:00
|
|
|
import { DropdownPopup, TooltipAnchor, Spinner, useToastContext } from '@librechat/client';
|
2024-08-22 17:09:05 -04:00
|
|
|
import type { TConversationTag } from 'librechat-data-provider';
|
2024-12-29 23:31:41 +01:00
|
|
|
import type { FC } from 'react';
|
|
|
|
|
import type * as t from '~/common';
|
2024-07-29 07:45:59 -07:00
|
|
|
import { useConversationTagsQuery, useTagConversationMutation } from '~/data-provider';
|
|
|
|
|
import { BookmarkContext } from '~/Providers/BookmarkContext';
|
2024-08-16 10:30:14 +02:00
|
|
|
import { BookmarkEditDialog } from '~/components/Bookmarks';
|
2024-12-29 23:31:41 +01:00
|
|
|
import { useBookmarkSuccess, useLocalize } from '~/hooks';
|
2024-08-16 10:30:14 +02:00
|
|
|
import { NotificationSeverity } from '~/common';
|
2024-08-22 17:09:05 -04:00
|
|
|
import { cn, logger } from '~/utils';
|
2024-07-29 07:45:59 -07:00
|
|
|
import store from '~/store';
|
|
|
|
|
|
|
|
|
|
const BookmarkMenu: FC = () => {
|
2024-12-29 23:31:41 +01:00
|
|
|
const localize = useLocalize();
|
2024-08-22 17:09:05 -04:00
|
|
|
const queryClient = useQueryClient();
|
2024-08-16 10:30:14 +02:00
|
|
|
const { showToast } = useToastContext();
|
2024-07-29 07:45:59 -07:00
|
|
|
|
2024-08-16 10:30:14 +02:00
|
|
|
const conversation = useRecoilValue(store.conversationByIndex(0)) || undefined;
|
2024-08-08 21:25:10 -04:00
|
|
|
const conversationId = conversation?.conversationId ?? '';
|
2024-08-22 17:09:05 -04:00
|
|
|
const updateConvoTags = useBookmarkSuccess(conversationId);
|
2025-01-04 12:01:13 -05:00
|
|
|
const tags = conversation?.tags;
|
2025-02-06 08:11:47 -08:00
|
|
|
const isTemporary = conversation?.expiredAt != null;
|
2024-08-22 17:09:05 -04:00
|
|
|
|
2024-12-29 23:31:41 +01:00
|
|
|
const menuId = useId();
|
|
|
|
|
const [isMenuOpen, setIsMenuOpen] = useState(false);
|
|
|
|
|
const [isDialogOpen, setIsDialogOpen] = useState(false);
|
2024-07-29 07:45:59 -07:00
|
|
|
|
2024-08-22 17:09:05 -04:00
|
|
|
const mutation = useTagConversationMutation(conversationId, {
|
2024-12-29 23:31:41 +01:00
|
|
|
onSuccess: (newTags: string[], vars) => {
|
2024-08-22 17:09:05 -04:00
|
|
|
updateConvoTags(newTags);
|
2024-12-29 23:31:41 +01:00
|
|
|
const tagElement = document.getElementById(vars.tag);
|
|
|
|
|
console.log('tagElement', tagElement);
|
|
|
|
|
if (tagElement) {
|
|
|
|
|
setTimeout(() => tagElement.focus(), 2);
|
|
|
|
|
}
|
2024-08-22 17:09:05 -04:00
|
|
|
},
|
|
|
|
|
onError: () => {
|
|
|
|
|
showToast({
|
|
|
|
|
message: 'Error adding bookmark',
|
|
|
|
|
severity: NotificationSeverity.ERROR,
|
|
|
|
|
});
|
|
|
|
|
},
|
2024-12-29 23:31:41 +01:00
|
|
|
onMutate: (vars) => {
|
|
|
|
|
const tagElement = document.getElementById(vars.tag);
|
|
|
|
|
console.log('tagElement', tagElement);
|
|
|
|
|
if (tagElement) {
|
|
|
|
|
setTimeout(() => tagElement.focus(), 2);
|
|
|
|
|
}
|
|
|
|
|
},
|
2024-08-22 17:09:05 -04:00
|
|
|
});
|
2024-07-29 07:45:59 -07:00
|
|
|
|
|
|
|
|
const { data } = useConversationTagsQuery();
|
|
|
|
|
|
2024-08-16 10:30:14 +02:00
|
|
|
const isActiveConvo = Boolean(
|
2024-08-08 21:25:10 -04:00
|
|
|
conversation &&
|
2024-08-16 10:30:14 +02:00
|
|
|
conversationId &&
|
|
|
|
|
conversationId !== Constants.NEW_CONVO &&
|
|
|
|
|
conversationId !== 'search',
|
|
|
|
|
);
|
2024-07-29 07:45:59 -07:00
|
|
|
|
2024-08-16 10:30:14 +02:00
|
|
|
const handleSubmit = useCallback(
|
2024-08-22 17:09:05 -04:00
|
|
|
(tag?: string) => {
|
2024-08-16 10:30:14 +02:00
|
|
|
if (tag === undefined || tag === '' || !conversationId) {
|
|
|
|
|
showToast({
|
|
|
|
|
message: 'Invalid tag or conversationId',
|
|
|
|
|
severity: NotificationSeverity.ERROR,
|
|
|
|
|
});
|
|
|
|
|
return;
|
|
|
|
|
}
|
2024-07-29 07:45:59 -07:00
|
|
|
|
2024-08-22 17:09:05 -04:00
|
|
|
logger.log('tag_mutation', 'BookmarkMenu - handleSubmit: tags before setting', tags);
|
2024-12-29 23:31:41 +01:00
|
|
|
|
2024-08-22 17:09:05 -04:00
|
|
|
const allTags =
|
|
|
|
|
queryClient.getQueryData<TConversationTag[]>([QueryKeys.conversationTags]) ?? [];
|
|
|
|
|
const existingTags = allTags.map((t) => t.tag);
|
2025-01-04 12:01:13 -05:00
|
|
|
const filteredTags = tags?.filter((t) => existingTags.includes(t));
|
2024-12-29 23:31:41 +01:00
|
|
|
|
2024-08-22 17:09:05 -04:00
|
|
|
logger.log('tag_mutation', 'BookmarkMenu - handleSubmit: tags after filtering', filteredTags);
|
2025-01-04 12:01:13 -05:00
|
|
|
const newTags =
|
|
|
|
|
filteredTags?.includes(tag) === true
|
|
|
|
|
? filteredTags.filter((t) => t !== tag)
|
|
|
|
|
: [...(filteredTags ?? []), tag];
|
2024-12-29 23:31:41 +01:00
|
|
|
|
2024-08-22 17:09:05 -04:00
|
|
|
logger.log('tag_mutation', 'BookmarkMenu - handleSubmit: tags after', newTags);
|
|
|
|
|
mutation.mutate({
|
|
|
|
|
tags: newTags,
|
2024-12-29 23:31:41 +01:00
|
|
|
tag,
|
2024-08-22 17:09:05 -04:00
|
|
|
});
|
2024-08-16 10:30:14 +02:00
|
|
|
},
|
2024-08-22 17:09:05 -04:00
|
|
|
[tags, conversationId, mutation, queryClient, showToast],
|
2024-08-16 10:30:14 +02:00
|
|
|
);
|
|
|
|
|
|
2024-12-29 23:31:41 +01:00
|
|
|
const newBookmarkRef = useRef<HTMLButtonElement>(null);
|
|
|
|
|
|
2026-01-21 10:49:50 -08:00
|
|
|
const tagsCount = tags?.length ?? 0;
|
|
|
|
|
const hasBookmarks = tagsCount > 0;
|
|
|
|
|
|
|
|
|
|
const buttonAriaLabel = useMemo(() => {
|
|
|
|
|
if (tagsCount > 0) {
|
|
|
|
|
return localize('com_ui_bookmarks_count_selected', { count: tagsCount });
|
|
|
|
|
}
|
|
|
|
|
return localize('com_ui_bookmarks_add');
|
|
|
|
|
}, [tagsCount, localize]);
|
|
|
|
|
|
2024-12-29 23:31:41 +01:00
|
|
|
const dropdownItems: t.MenuItemProps[] = useMemo(() => {
|
|
|
|
|
const items: t.MenuItemProps[] = [
|
|
|
|
|
{
|
|
|
|
|
id: '%___new___bookmark___%',
|
|
|
|
|
label: localize('com_ui_bookmarks_new'),
|
|
|
|
|
icon: <BookmarkPlusIcon className="size-4" />,
|
|
|
|
|
hideOnClick: false,
|
|
|
|
|
ref: newBookmarkRef,
|
|
|
|
|
render: (props) => <button {...props} />,
|
|
|
|
|
onClick: () => setIsDialogOpen(true),
|
|
|
|
|
},
|
|
|
|
|
];
|
|
|
|
|
|
|
|
|
|
if (data) {
|
|
|
|
|
for (const tag of data) {
|
2026-01-21 10:49:50 -08:00
|
|
|
const isSelected = tags?.includes(tag.tag) === true;
|
2024-12-29 23:31:41 +01:00
|
|
|
items.push({
|
|
|
|
|
id: tag.tag,
|
|
|
|
|
label: tag.tag,
|
2025-01-04 12:01:13 -05:00
|
|
|
hideOnClick: false,
|
2026-01-21 10:49:50 -08:00
|
|
|
icon: isSelected ? (
|
|
|
|
|
<BookmarkFilledIcon className="size-4" />
|
|
|
|
|
) : (
|
|
|
|
|
<BookmarkIcon className="size-4" />
|
|
|
|
|
),
|
2024-12-29 23:31:41 +01:00
|
|
|
onClick: () => handleSubmit(tag.tag),
|
|
|
|
|
disabled: mutation.isLoading,
|
2026-01-21 10:49:50 -08:00
|
|
|
ariaChecked: isSelected,
|
2024-12-29 23:31:41 +01:00
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return items;
|
|
|
|
|
}, [tags, data, handleSubmit, mutation.isLoading, localize]);
|
|
|
|
|
|
2024-08-16 10:30:14 +02:00
|
|
|
if (!isActiveConvo) {
|
2024-08-22 17:09:05 -04:00
|
|
|
return null;
|
2024-08-16 10:30:14 +02:00
|
|
|
}
|
2024-07-29 07:45:59 -07:00
|
|
|
|
2025-02-06 08:11:47 -08:00
|
|
|
if (isTemporary) {
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
|
2024-08-08 21:25:10 -04:00
|
|
|
const renderButtonContent = () => {
|
2024-08-22 17:09:05 -04:00
|
|
|
if (mutation.isLoading) {
|
2024-08-16 10:30:14 +02:00
|
|
|
return <Spinner aria-label="Spinner" />;
|
2024-08-08 21:25:10 -04:00
|
|
|
}
|
2026-01-21 10:49:50 -08:00
|
|
|
if (hasBookmarks) {
|
|
|
|
|
return <BookmarkFilledIcon className="icon-lg" aria-hidden="true" />;
|
2024-08-08 21:25:10 -04:00
|
|
|
}
|
2026-01-21 10:49:50 -08:00
|
|
|
return <BookmarkIcon className="icon-lg" aria-hidden="true" />;
|
2024-08-16 10:30:14 +02:00
|
|
|
};
|
|
|
|
|
|
2024-07-29 07:45:59 -07:00
|
|
|
return (
|
2024-12-29 23:31:41 +01:00
|
|
|
<BookmarkContext.Provider value={{ bookmarks: data || [] }}>
|
|
|
|
|
<DropdownPopup
|
2025-06-04 00:13:28 -04:00
|
|
|
portal={true}
|
2024-12-29 23:31:41 +01:00
|
|
|
menuId={menuId}
|
2025-06-04 00:13:28 -04:00
|
|
|
focusLoop={true}
|
2024-12-29 23:31:41 +01:00
|
|
|
isOpen={isMenuOpen}
|
2025-05-08 12:12:36 -04:00
|
|
|
unmountOnHide={true}
|
2024-12-29 23:31:41 +01:00
|
|
|
setIsOpen={setIsMenuOpen}
|
2025-01-04 12:01:13 -05:00
|
|
|
keyPrefix={`${conversationId}-bookmark-`}
|
2024-12-29 23:31:41 +01:00
|
|
|
trigger={
|
|
|
|
|
<TooltipAnchor
|
|
|
|
|
description={localize('com_ui_bookmarks_add')}
|
|
|
|
|
render={
|
|
|
|
|
<Ariakit.MenuButton
|
|
|
|
|
id="bookmark-menu-button"
|
2026-01-21 10:49:50 -08:00
|
|
|
aria-label={buttonAriaLabel}
|
|
|
|
|
aria-pressed={hasBookmarks}
|
2024-12-29 23:31:41 +01:00
|
|
|
className={cn(
|
2025-12-29 16:47:34 +01:00
|
|
|
'mt-text-sm flex size-10 flex-shrink-0 items-center justify-center gap-2 rounded-xl border border-border-light bg-presentation text-sm transition-colors duration-200 hover:bg-surface-hover',
|
2024-12-29 23:31:41 +01:00
|
|
|
isMenuOpen ? 'bg-surface-hover' : '',
|
|
|
|
|
)}
|
|
|
|
|
data-testid="bookmark-menu"
|
|
|
|
|
>
|
|
|
|
|
{renderButtonContent()}
|
|
|
|
|
</Ariakit.MenuButton>
|
|
|
|
|
}
|
|
|
|
|
/>
|
|
|
|
|
}
|
|
|
|
|
items={dropdownItems}
|
|
|
|
|
/>
|
2024-08-16 10:30:14 +02:00
|
|
|
<BookmarkEditDialog
|
|
|
|
|
tags={tags}
|
2024-12-29 23:31:41 +01:00
|
|
|
open={isDialogOpen}
|
2025-01-04 12:01:13 -05:00
|
|
|
setTags={updateConvoTags}
|
2024-12-29 23:31:41 +01:00
|
|
|
setOpen={setIsDialogOpen}
|
|
|
|
|
triggerRef={newBookmarkRef}
|
|
|
|
|
conversationId={conversationId}
|
|
|
|
|
context="BookmarkMenu - BookmarkEditDialog"
|
2024-08-16 10:30:14 +02:00
|
|
|
/>
|
2024-12-29 23:31:41 +01:00
|
|
|
</BookmarkContext.Provider>
|
2024-07-29 07:45:59 -07:00
|
|
|
);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
export default BookmarkMenu;
|