@redocly/theme 0.59.0-next.1 → 0.59.0-next.11

package/src/components/Dropdown/Dropdown.tsx

@@ -1,7 +1,7 @@
-import React, { cloneElement, useRef } from 'react';
+import React, { cloneElement, useRef, forwardRef } from 'react';
 import styled from 'styled-components';
 
-import type { PropsWithChildren, ReactElement, JSX } from 'react';
+import type { PropsWithChildren, ReactElement } from 'react';
 
 import { useOutsideClick, useControlledState } from '@redocly/theme/core/hooks';
 import { ChevronDownIcon } from '@redocly/theme/icons/ChevronDownIcon/ChevronDownIcon';
@@ -32,84 +32,89 @@ export type DropdownProps = PropsWithChildren<{
   onClose?: () => void;
 }>;
 
-export function Dropdown({
-  children,
-  className,
-  active,
-  trigger,
-  triggerEvent = 'click',
-  closeOnClick = true,
-  withArrow,
-  dataAttributes,
-  placement,
-  alignment,
-  onClick,
-  onClose,
-}: DropdownProps): JSX.Element {
-  const dropdownRef = useRef<HTMLDivElement | null>(null);
-  const [isOpen, setIsOpen] = useControlledState<boolean>(false, active);
-
-  const handleOpen = () => {
-    setIsOpen(true);
-  };
-
-  const handleClose = () => {
-    setIsOpen(false);
-    onClose?.();
-  };
-
-  const handleChildClick = () => {
-    handleClose();
-  };
-
-  const handleToggle = (event: React.UIEvent) => {
-    event.stopPropagation();
-    event.preventDefault();
-    setIsOpen(!isOpen);
-  };
-
-  const handleKeyDown = (event: React.KeyboardEvent) => {
-    if (event.key === 'Enter' || event.key === ' ') {
-      handleToggle(event);
-    }
-  };
-
-  useOutsideClick(dropdownRef, handleClose);
-
-  const triggerChild = React.Children.only(trigger) as ReactElement<TriggerProps>;
-
-  const dropdownTrigger = cloneElement(triggerChild, {
-    onClick: triggerEvent === 'click' ? handleToggle : undefined,
-    icon: withArrow ? isOpen ? <ChevronUpIcon /> : <ChevronDownIcon /> : undefined,
-    ...(withArrow ? { iconPosition: 'right' } : {}),
-    ...triggerChild.props,
-    onKeyDown: triggerEvent === 'click' ? handleKeyDown : undefined,
-  });
-
-  return (
-    <DropdownWrapper
-      data-component-name="Dropdown/Dropdown"
-      data-testid="dropdown"
-      {...dataAttributes}
-      className={className}
-      ref={dropdownRef}
-      onPointerEnter={triggerEvent === 'hover' ? handleOpen : undefined}
-      onPointerLeave={triggerEvent === 'hover' ? handleClose : undefined}
-      onClick={onClick}
-    >
-      {dropdownTrigger}
-
-      <ChildrenWrapper
-        placement={placement}
-        alignment={alignment}
-        isOpen={isOpen}
-        onClick={closeOnClick ? handleChildClick : undefined}
+export const Dropdown = forwardRef<HTMLDivElement, DropdownProps>(
+  (
+    {
+      children,
+      className,
+      active,
+      trigger,
+      triggerEvent = 'click',
+      closeOnClick = true,
+      withArrow,
+      dataAttributes,
+      placement,
+      alignment,
+      onClick,
+      onClose,
+    },
+    ref,
+  ) => {
+    const dropdownRef = useRef<HTMLDivElement | null>(null);
+    const [isOpen, setIsOpen] = useControlledState<boolean>(false, active);
+
+    const handleOpen = () => {
+      setIsOpen(true);
+    };
+
+    const handleClose = () => {
+      setIsOpen(false);
+      onClose?.();
+    };
+
+    const handleChildClick = () => {
+      handleClose();
+    };
+
+    const handleToggle = (event: React.UIEvent) => {
+      event.stopPropagation();
+      event.preventDefault();
+      setIsOpen(!isOpen);
+    };
+
+    const handleKeyDown = (event: React.KeyboardEvent) => {
+      if (event.key === 'Enter' || event.key === ' ') {
+        handleToggle(event);
+      }
+    };
+
+    useOutsideClick((ref as React.RefObject<HTMLElement | null>) || dropdownRef, handleClose);
+
+    const triggerChild = React.Children.only(trigger) as ReactElement<TriggerProps>;
+
+    const dropdownTrigger = cloneElement(triggerChild, {
+      onClick: triggerEvent === 'click' ? handleToggle : undefined,
+      icon: withArrow ? isOpen ? <ChevronUpIcon /> : <ChevronDownIcon /> : undefined,
+      ...(withArrow ? { iconPosition: 'right' } : {}),
+      ...triggerChild.props,
+      onKeyDown: triggerEvent === 'click' ? handleKeyDown : undefined,
+    });
+
+    return (
+      <DropdownWrapper
+        data-component-name="Dropdown/Dropdown"
+        data-testid="dropdown"
+        {...dataAttributes}
+        className={className}
+        ref={ref || dropdownRef}
+        onPointerEnter={triggerEvent === 'hover' ? handleOpen : undefined}
+        onPointerLeave={triggerEvent === 'hover' ? handleClose : undefined}
+        onClick={onClick}
       >
-        {children}
-      </ChildrenWrapper>
-    </DropdownWrapper>
-  );
-}
+        {dropdownTrigger}
+
+        <ChildrenWrapper
+          placement={placement}
+          alignment={alignment}
+          isOpen={isOpen}
+          onClick={closeOnClick ? handleChildClick : undefined}
+        >
+          {children}
+        </ChildrenWrapper>
+      </DropdownWrapper>
+    );
+  },
+);
 
 const DropdownWrapper = styled.div`
   --button-gap: var(--spacing-xxs);

package/src/components/Menu/MenuItem.tsx

@@ -82,6 +82,7 @@ export function MenuItem(props: React.PropsWithChildren<MenuItemProps>): JSX.Ele
       role={item.link ? 'none' : 'link'}
       tabIndex={!item.link ? 0 : undefined}
       data-testid="menu-item-label"
+      data-active={item.active}
     >
       {hasChevron ? <ChevronWrapper>{chevron}</ChevronWrapper> : null}
       <MenuItemIcon icon={item.icon} srcSet={item.srcSet} />

package/src/components/Navbar/NavbarItem.tsx

@@ -34,12 +34,13 @@ export function NavbarItem({ navItem, className }: NavbarItemProps): JSX.Element
   if (navItem.type !== 'link' && !navItem.items) return null;
 
   const item = navItem as ResolvedNavLinkItem;
-  const normalizedPath =
-    (item.link && item.link !== '/' ? removeTrailingSlash(item.link) : item.link) || '';
+  const normalizedPath = (item.link ? removeTrailingSlash(item.link) : item.link) || '';
 
-  const isActive =
-    pathname ===
-    withPathPrefix(getPathnameForLocale(normalizedPath, defaultLocale, currentLocale, locales));
+  const pathWithPathPrefix = withPathPrefix(
+    getPathnameForLocale(normalizedPath, defaultLocale, currentLocale, locales),
+  );
+
+  const isActive = removeTrailingSlash(pathname) === removeTrailingSlash(pathWithPathPrefix);
 
   const itemContent = (
     <NavbarMenuItem

package/src/components/PageActions/PageActions.tsx

@@ -77,7 +77,7 @@ export function PageActions(props: PageActionProps): JSX.Element | null {
         </Button>
         {actions.length > 1 ? (
           <Dropdown withArrow trigger={<Button />} placement="bottom" alignment="end">
-            <DropdownMenu items={menuItems} />
+            <StyledDropdownMenu items={menuItems} />
           </Dropdown>
         ) : null}
       </ButtonGroup>
@@ -110,3 +110,7 @@ const LinkMenuItem = styled(Link)`
   text-decoration: none;
   --link-decoration-hover: none;
 `;
+
+const StyledDropdownMenu = styled(DropdownMenu)`
+  --dropdown-menu-max-height: var(--page-actions-dropdown-max-height);
+`;

package/src/components/PageActions/variables.ts

@@ -7,6 +7,8 @@ export const pageActions = css`
   --page-actions-button-text-color: var(--text-color-secondary);
   --page-actions-button-padding: 5px 14px 5px var(--spacing-sm);
 
+  --page-actions-dropdown-max-height: fit-content;
+
   --page-actions-menu-item-padding: 3px 0;
   --page-actions-menu-item-gap: var(--spacing-xs);
   --page-actions-menu-item-icon-color: var(--icon-color-secondary);

package/src/components/Search/FilterFields/SearchFilterFieldTags.tsx

@@ -3,7 +3,7 @@ import styled from 'styled-components';
 
 import type { SearchFacet, SearchFacetCount } from '@redocly/theme/core/types';
 
-import { Tag, type TagProps } from '@redocly/theme/components/Tag/Tag';
+import { Tag } from '@redocly/theme/components/Tag/Tag';
 
 type SearchFilterFieldTagsProps = {
   className?: string;
@@ -47,6 +47,7 @@ export function SearchFilterFieldTags({
             }}
             active={active}
             borderless
+            selectable
           >
             {value} {isCounterVisible && <span>{count}</span>}
           </FilterTagWrapper>
@@ -62,9 +63,8 @@ const FilterTagsWrapper = styled.div`
   gap: var(--search-filter-field-tags-gap);
 `;
 
-const FilterTagWrapper = styled(Tag)<{ color: TagProps['color'] }>`
+const FilterTagWrapper = styled(Tag)`
   text-transform: uppercase;
   cursor: pointer;
-  ${({ color }) => color && `background-color: var(--tag-operation-bg-color-${color});`}
   margin: var(--search-filter-field-tags-tag-margin);
 `;

package/src/components/Search/SearchAiActionButtons.tsx

@@ -0,0 +1,76 @@
+import React from 'react';
+import styled from 'styled-components';
+
+import type { JSX } from 'react';
+
+import { FeedbackType } from '@redocly/theme/core/types';
+import { Button } from '@redocly/theme/components/Button/Button';
+import { ThumbUpIcon } from '@redocly/theme/icons/ThumbUpIcon/ThumbUpIcon';
+import { ThumbUpFilledIcon } from '@redocly/theme/icons/ThumbUpFilledIcon/ThumbUpFilledIcon';
+import { ThumbDownIcon } from '@redocly/theme/icons/ThumbDownIcon/ThumbDownIcon';
+import { ThumbDownFilledIcon } from '@redocly/theme/icons/ThumbDownFilledIcon/ThumbDownFilledIcon';
+import { CopyButton } from '@redocly/theme/components/Buttons/CopyButton';
+
+export type SearchAiActionButtonsProps = {
+  content: string;
+  className?: string;
+  feedback?: FeedbackType;
+  onFeedback: (feedback: FeedbackType) => void;
+  disabled?: boolean;
+};
+
+export function SearchAiActionButtons({
+  content,
+  className,
+  feedback,
+  onFeedback,
+  disabled,
+}: SearchAiActionButtonsProps): JSX.Element {
+  return (
+    <ActionButtonsWrapper className={className} data-component-name="Search/SearchAiActionButtons">
+      <CopyButton data={content} />
+      <FeedbackButton
+        variant="text"
+        size="small"
+        icon={feedback === FeedbackType.Like ? <ThumbUpFilledIcon /> : <ThumbUpIcon />}
+        onClick={() => !disabled && onFeedback(FeedbackType.Like)}
+        extraClass={feedback === FeedbackType.Like ? 'active' : ''}
+        aria-label="Like this response"
+        disabled={disabled}
+      />
+
+      <FeedbackButton
+        variant="text"
+        size="small"
+        icon={feedback === FeedbackType.Dislike ? <ThumbDownFilledIcon /> : <ThumbDownIcon />}
+        onClick={() => !disabled && onFeedback(FeedbackType.Dislike)}
+        extraClass={feedback === FeedbackType.Dislike ? 'active' : ''}
+        aria-label="Dislike this response"
+        disabled={disabled}
+      />
+    </ActionButtonsWrapper>
+  );
+}
+
+const ActionButtonsWrapper = styled.div`
+  display: flex;
+  align-items: center;
+  gap: var(--search-ai-feedback-gap);
+`;
+
+const FeedbackButton = styled(Button)`
+  &:disabled {
+    pointer-events: none;
+    cursor: default;
+    opacity: 1;
+    background-color: var(--button-bg-color);
+    color: var(--button-color);
+    border-color: var(--button-border-color);
+  }
+
+  &:disabled.active {
+    background-color: var(--button-bg-color-active);
+    border-color: var(--button-border-color-active);
+    color: var(--button-color-active);
+  }
+`;

package/src/components/Search/SearchAiConversationInput.tsx

@@ -13,6 +13,8 @@ type SearchAiConversationInputProps = {
   isGeneratingResponse: boolean;
   placeholder?: string;
   className?: string;
+  disabled?: boolean;
+  multiline?: boolean;
 };
 
 export function SearchAiConversationInput({
@@ -20,11 +22,13 @@ export function SearchAiConversationInput({
   onMessageSent,
   className,
   placeholder,
+  disabled,
+  multiline = false,
 }: SearchAiConversationInputProps): JSX.Element {
   const { useTranslate } = useThemeHooks();
   const { translate } = useTranslate();
 
-  const inputRef = useRef<HTMLInputElement>(null);
+  const inputRef = useRef<HTMLInputElement | HTMLTextAreaElement>(null);
   const [query, setQuery] = useState('');
 
   useEffect(() => {
@@ -36,35 +40,54 @@ export function SearchAiConversationInput({
   }, [isGeneratingResponse]);
 
   const handleSendMessage = () => {
+    if (disabled) return;
+
     setQuery('');
     onMessageSent(query);
   };
 
-  const handleOnKeyUp = (e: React.KeyboardEvent<HTMLInputElement>) => {
+  const handleOnKeyDown = (
+    e: React.KeyboardEvent<HTMLInputElement | HTMLTextAreaElement>,
+  ): void => {
     if (e.key === 'Enter' && !isGeneratingResponse) {
+      if (multiline && e.shiftKey) {
+        return; // Allow new line in textarea
+      }
+      e.preventDefault();
       handleSendMessage();
     }
   };
 
-  const isDisabled = isGeneratingResponse || query.trim().length === 0;
+  const isDisabled = disabled || isGeneratingResponse || query.trim().length === 0;
+
+  const commonProps = {
+    placeholder:
+      placeholder || translate('search.ai.followUpQuestion', 'Ask a follow up question?'),
+    onChange: (e: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>) =>
+      setQuery(e.target.value),
+    onKeyDown: handleOnKeyDown,
+    value: query,
+    disabled: disabled || isGeneratingResponse,
+    maxLength: AI_SEARCH_MAX_MESSAGE_LENGTH,
+  };
 
   return (
     <SearchAiConversationInputWrapper
       data-component-name="Search/SearchAiConversationInput"
       className={className}
     >
-      <ConversationInput
-        ref={inputRef}
-        type="text"
-        placeholder={
-          placeholder || translate('search.ai.followUpQuestion', 'Ask a follow up question?')
-        }
-        onChange={(e) => setQuery(e.target.value)}
-        onKeyUp={handleOnKeyUp}
-        value={query}
-        disabled={isGeneratingResponse}
-        maxLength={AI_SEARCH_MAX_MESSAGE_LENGTH}
-      />
+      {multiline ? (
+        <ConversationTextarea
+          ref={inputRef as React.RefObject<HTMLTextAreaElement>}
+          {...commonProps}
+        />
+      ) : (
+        <ConversationInput
+          ref={inputRef as React.RefObject<HTMLInputElement>}
+          type="text"
+          {...commonProps}
+        />
+      )}
 
       <SendButton
         disabled={isDisabled}
@@ -93,9 +116,10 @@ const SearchAiConversationInputWrapper = styled.div`
   position: relative;
 `;
 
-const ConversationInput = styled.input`
+const inputStyles = `
   width: 100%;
   padding: var(--search-ai-conversation-input-padding);
+  padding-right: var(--search-ai-conversation-input-padding-right, 52px);
   border: var(--search-ai-conversation-input-border);
   border-radius: var(--search-ai-conversation-input-border-radius);
   background-color: var(--search-ai-conversation-input-bg-color);
@@ -111,21 +135,40 @@ const ConversationInput = styled.input`
     border-color: var(--search-ai-conversation-input-border-color-focus);
   }
 
+  &:disabled {
+    background-color: var(--search-ai-conversation-input-bg-color-disabled);
+  }
+
   &:focus:disabled {
     border-color: var(--search-ai-conversation-input-border-color-disabled);
   }
 `;
 
+const ConversationInput = styled.input`
+  ${inputStyles}
+  height: var(--search-ai-conversation-input-min-height);
+`;
+
+const ConversationTextarea = styled.textarea`
+  ${inputStyles}
+  min-height: var(--search-ai-conversation-input-min-height);
+  max-height: var(--search-ai-conversation-input-max-height);
+  resize: none;
+  field-sizing: content;
+`;
+
 const SendButton = styled(Button)`
   position: absolute;
   right: var(--search-ai-conversation-input-send-button-right);
-  top: 50%;
-  transform: translateY(-50%);
+  bottom: var(--search-ai-conversation-input-send-button-bottom);
+  transform: translateY(50%);
   transition: background-color 0.2s ease;
   background-color: var(--search-ai-conversation-input-send-button-bg-color);
   display: flex;
   align-items: center;
   justify-content: center;
+  border-radius: var(--search-ai-conversation-input-send-button-border-radius);
+  padding: var(--search-ai-conversation-input-send-button-padding);
 
   &:hover {
     background-color: var(--search-ai-conversation-input-send-button-bg-color-hover);

package/src/components/Search/SearchAiDialog.tsx

@@ -1,7 +1,12 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useCallback } from 'react';
 import styled from 'styled-components';
 
 import type { JSX } from 'react';
+import type {
+  AiSearchConversationItem,
+  SearchAiMessageResource,
+  FeedbackType,
+} from '@redocly/theme/core/types';
 
 import { useThemeConfig, useThemeHooks } from '@redocly/theme/core/hooks';
 import { Button } from '@redocly/theme/components/Button/Button';
@@ -11,7 +16,6 @@ import {
   AI_SEARCH_ERROR_CONFIG as ERROR_CONFIG,
   AiSearchConversationRole,
 } from '@redocly/theme/core/constants';
-import { AiSearchConversationItem } from '@redocly/theme/core/types';
 import { SearchAiMessage } from '@redocly/theme/components/Search/SearchAiMessage';
 import { Admonition } from '@redocly/theme/components/Admonition/Admonition';
 import { AiStarsIcon } from '@redocly/theme/icons/AiStarsIcon/AiStarsIcon';
@@ -20,15 +24,16 @@ export type SearchAiDialogProps = {
   response: string | undefined;
   isGeneratingResponse: boolean;
   error: AiSearchError | null;
-  resources: {
-    url: string;
-    title: string;
-  }[];
+  resources: SearchAiMessageResource[];
   initialMessage?: string;
   className?: string;
   conversation: AiSearchConversationItem[];
   setConversation: React.Dispatch<React.SetStateAction<AiSearchConversationItem[]>>;
-  onMessageSent: (message: string, history?: AiSearchConversationItem[]) => void;
+  onMessageSent: (
+    message: string,
+    history?: AiSearchConversationItem[],
+    messageId?: string,
+  ) => void;
 };
 
 export function SearchAiDialog({
@@ -56,21 +61,28 @@ export function SearchAiDialog({
       ? translate('search.ai.followUpQuestion', 'Ask a follow up question?')
       : translate('search.ai.placeholder', 'Ask a question...');
 
-  const scrollToBottom = () => {
+  const scrollToBottom = useCallback(() => {
     conversationEndRef.current?.scrollIntoView({ block: 'end' });
-  };
+  }, []);
 
-  const handleOnMessageSent = (message: string) => {
-    if (!message.trim()) {
-      return;
-    }
-    const mappedHistory = conversation.map(({ role, content }) => ({
-      role,
-      content,
-    }));
-    onMessageSent(message, mappedHistory);
-    setConversation((prev) => [...prev, { role: AiSearchConversationRole.USER, content: message }]);
-  };
+  const handleOnMessageSent = useCallback(
+    (message: string) => {
+      if (!message.trim()) {
+        return;
+      }
+      const mappedHistory = conversation.map(({ role, content }) => ({
+        role,
+        content,
+      }));
+
+      onMessageSent(message, mappedHistory);
+      setConversation((prev) => [
+        ...prev,
+        { role: AiSearchConversationRole.USER, content: message },
+      ]);
+    },
+    [conversation, onMessageSent, setConversation],
+  );
 
   useEffect(() => {
     if (!initialMessage?.trim().length) {
@@ -94,11 +106,16 @@ export function SearchAiDialog({
       if (lastMessage && lastMessage.role === AiSearchConversationRole.ASSISTANT) {
         return [
           ...prev.slice(0, -1),
-          { role: AiSearchConversationRole.ASSISTANT, content, resources },
+          {
+            role: AiSearchConversationRole.ASSISTANT,
+            content,
+            resources,
+            messageId: lastMessage.messageId,
+          },
         ];
       }
 
-      return [...prev, { role: AiSearchConversationRole.ASSISTANT, content }];
+      return [...prev, { role: AiSearchConversationRole.ASSISTANT, content, resources }];
     });
   }, [response, conversation.length, error, resources, setConversation]);
 
@@ -110,7 +127,16 @@ export function SearchAiDialog({
 
   useEffect(() => {
     scrollToBottom();
-  }, [conversation, isGeneratingResponse]);
+  }, [conversation, isGeneratingResponse, scrollToBottom]);
+
+  const handleFeedbackChange = useCallback(
+    (messageId: string, feedback: FeedbackType | undefined) => {
+      setConversation((prev) =>
+        prev.map((item) => (item.messageId === messageId ? { ...item, feedback } : item)),
+      );
+    },
+    [setConversation],
+  );
 
   return (
     <SearchAiDialogWrapper data-component-name="Search/SearchAiDialog" className={className}>
@@ -142,6 +168,9 @@ export function SearchAiDialog({
               index === conversation.length - 1
             }
             resources={item.resources}
+            messageId={item.messageId}
+            feedback={item.feedback}
+            onFeedbackChange={handleFeedbackChange}
           />
         ))}