@redocly/theme 0.29.0 → 0.30.0

package/lib/components/CodeBlock/CodeBlock.js

@@ -59,7 +59,7 @@ function CodeBlock({ lang, source, externalSource, header, dataTestId = 'source-
                     ? (0, utils_1.addLineNumbers)(highlightedCode, startLineNumber)
                     : highlightedCode,
             }, "data-cy": dataTestId, withControls: true }),
-        reportDialog.visible && (react_1.default.createElement(Feedback_1.ReportDialog, Object.assign({}, reportDialog.props, { location: sourceCode })))));
+        reportDialog.visible && (react_1.default.createElement(Feedback_1.ReportDialog, Object.assign({}, reportDialog.props, { location: sourceCode, lang: lang })))));
 }
 exports.CodeBlock = CodeBlock;
 const Wrapper = styled_components_1.default.div ``;

package/lib/components/Feedback/Comment.js

@@ -42,13 +42,13 @@ const Comment = ({ settings, onSubmit, onCancel, className, standAlone = true, }
         if (!text)
             return;
         setSubmitValue(text);
-        onSubmit({ comment: text, path: window.location.href });
+        onSubmit({ comment: text });
     };
     const handleTextAreaChange = (e) => {
         const commentValue = e.target.value;
         setText(commentValue);
         if (!standAlone) {
-            onSubmit({ comment: commentValue, path: window.location.href });
+            onSubmit({ comment: commentValue });
         }
     };
     if (submitValue) {

package/lib/components/Feedback/Mood.js

@@ -74,7 +74,6 @@ const Mood = ({ settings, onSubmit, className }) => {
             score: remapScore(score),
             comment,
             reasons,
-            path: window.location.href,
         });
         setIsSubmitted(true);
     };

package/lib/components/Feedback/Rating.js

@@ -50,7 +50,6 @@ const Rating = ({ settings, onSubmit, className }) => {
             comment,
             reasons,
             max: exports.FEEDBACK_MAX_RATING,
-            path: window.location.href,
         });
         setIsSubmitted(true);
     };

package/lib/components/Feedback/ReportDialog.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
 import type { ReportDialogProps } from '../../components/Feedback';
-export declare const ReportDialog: ({ location, settings, onSubmit, onCancel, submitFeedback, }: ReportDialogProps) => JSX.Element;
+export declare const ReportDialog: ({ location, settings, onSubmit, onCancel, submitFeedback, lang, }: ReportDialogProps) => JSX.Element;

package/lib/components/Feedback/ReportDialog.js

@@ -41,12 +41,12 @@ const styled_components_1 = __importDefault(require("styled-components"));
 const react_router_dom_1 = require("react-router-dom");
 const telemetry_1 = require("../../mocks/telemetry");
 const Comment_1 = require("../../components/Feedback/Comment");
-const ReportDialog = ({ location, settings, onSubmit, onCancel, submitFeedback, }) => {
+const ReportDialog = ({ location, settings, onSubmit, onCancel, submitFeedback, lang, }) => {
     const { label } = settings;
     const { pathname } = (0, react_router_dom_1.useLocation)();
-    return (React.createElement(Wrapper, { className: "modal" },
+    return (React.createElement(Wrapper, { className: "modal scroll-lock" },
         React.createElement(Comment_1.Comment, { settings: { label }, onSubmit: (value) => __awaiter(void 0, void 0, void 0, function* () {
-                yield submitFeedback({ type: 'problem', values: value, location, path: pathname });
+                yield submitFeedback({ type: 'problem', values: value, location, path: pathname, lang });
                 telemetry_1.telemetry.send('code_snippet_reported', {});
                 onSubmit();
             }), onCancel: onCancel })));

package/lib/components/Feedback/Scale.js

@@ -56,7 +56,6 @@ const Scale = ({ settings, onSubmit, className }) => {
             comment,
             reasons,
             max: exports.MAX_SCALE,
-            path: window.location.href,
         });
         setIsSubmitted(true);
     };

package/lib/components/Feedback/Sentiment.js

@@ -56,7 +56,6 @@ const Sentiment = ({ settings, onSubmit, className }) => {
             score,
             comment,
             reasons,
-            path: window.location.href,
         });
         setIsSubmitted(true);
     };

package/lib/components/Feedback/types.d.ts

@@ -5,7 +5,6 @@ export type RatingProps = {
         comment?: string;
         reasons?: string[];
         max: number;
-        path?: string;
     }) => void;
     settings?: {
         label?: string;
@@ -29,7 +28,6 @@ export type ScaleProps = {
         comment?: string;
         reasons?: string[];
         max?: number;
-        path?: string;
     }) => void;
     settings?: {
         label?: string;
@@ -54,7 +52,6 @@ export type MoodProps = {
         score: number;
         comment?: string;
         reasons?: string[];
-        path?: string;
     }) => void;
     settings?: {
         label?: string;
@@ -79,7 +76,6 @@ export type SentimentProps = {
         score: number;
         comment?: string;
         reasons?: string[];
-        path?: string;
     }) => void;
     settings?: {
         label?: string;
@@ -101,7 +97,6 @@ export type SentimentProps = {
 export type CommentProps = {
     onSubmit: (value: {
         comment: string;
-        path?: string;
     }) => void;
     onCancel?: () => unknown;
     settings?: {
@@ -122,6 +117,7 @@ export type ReasonsProps = {
 };
 export type ReportDialogProps = {
     location: string;
+    lang?: string;
     onSubmit: () => void;
     onCancel: () => void;
     settings: {

package/lib/components/Markdown/styledVariables.js

@@ -236,11 +236,11 @@ exports.markdown = (0, styled_components_1.css) `
   --md-tabs-content-padding: var(--spacing-base) 0; // @presenter Spacing
   --md-tabs-content-border: none; // @presenter Border
 
-  --md-tabs-tab-text-color: var(--text-secondary); // @presenter Color
-  --md-tabs-tab-font-size: var(--font-size-base); // @presenter FontSize
+  --md-tabs-tab-text-color: var(--text-primary); // @presenter Color
+  --md-tabs-tab-font-size: var(--font-size-lg); // @presenter FontSize
   --md-tabs-tab-font-family: var(--font-size-base); // @presenter FontFamily
   --md-tabs-tab-font-style: normal; // @presenter FontStyle
-  --md-tabs-tab-font-weight: var(--font-weight-regular); // @presenter FontWeight
+  --md-tabs-tab-font-weight: var(--font-weight-bold); // @presenter FontWeight
   --md-tabs-tab-background-color: none; // @presenter Color
   --md-tabs-tab-margin: 0 0 -1px 0; // @presenter Spacing
   --md-tabs-tab-padding: var(--spacing-sm) var(--spacing-base); // @presenter Spacing
@@ -255,8 +255,8 @@ exports.markdown = (0, styled_components_1.css) `
   --md-tabs-active-tab-font-weight: var(--md-tabs-tab-font-weight); // @presenter FontWeight
   --md-tabs-active-tab-background-color: var(--background-color); // @presenter Color
   --md-tabs-active-tab-padding: var(--md-tabs-tab-padding); // @presenter Spacing
-  --md-tabs-active-tab-border-color: var(--border-primary); // @presenter Color
-  --md-tabs-active-tab-border-width: 0 0 1px 0; // @presenter Spacing
+  --md-tabs-active-tab-border-color: var(--text-base); // @presenter Color
+  --md-tabs-active-tab-border-width: 0 0 2px 0; // @presenter Spacing
   --md-tabs-active-tab-border-radius: var(--md-tabs-tab-border-radius); // @presenter BorderRadius
   
   --md-tabs-hover-tab-text-color: var(--md-tabs-tab-text-color); // @presenter Color
@@ -267,7 +267,7 @@ exports.markdown = (0, styled_components_1.css) `
   --md-tabs-hover-tab-background-color: var(--md-tabs-tab-background-color); // @presenter Color
   --md-tabs-hover-tab-padding: var(--md-tabs-tab-padding); // @presenter Spacing
   --md-tabs-hover-tab-border-color: var(--border-secondary); // @presenter Color
-  --md-tabs-hover-tab-border-width: 0 0 1px 0; // @presenter Spacing
+  --md-tabs-hover-tab-border-width: 0 0 1.5px 0; // @presenter Spacing
   --md-tabs-hover-tab-border-radius: var(--md-tabs-tab-border-radius); // @presenter BorderRadius
 
   // @tokens End

package/lib/globalStyle.js

@@ -899,7 +899,7 @@ const error = (0, styled_components_1.css) `
   --detailed-error-message-font-family: var(--code-block-controls-font-family);
 `;
 const modal = (0, styled_components_1.css) `
-  body:has(.modal) {
+  body:has(.scroll-lock) {
     overflow: hidden;
   }
 

package/lib/types/portal/src/shared/types/feedback.d.ts

@@ -5,6 +5,7 @@ export type SubmitFeedbackParams = {
     values: Record<string, unknown>;
     path?: string;
     location?: string;
+    lang?: string;
 };
 export type FeedbackProps = {
     type: FEEDBACK_TYPES;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redocly/theme",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "description": "Shared UI components lib",
   "keywords": [
     "theme",

package/src/components/CodeBlock/CodeBlock.tsx

@@ -91,7 +91,11 @@ export function CodeBlock({
         withControls={true}
       />
       {reportDialog.visible && (
-        <ReportDialog {...(reportDialog.props as ReportDialogProps)} location={sourceCode} />
+        <ReportDialog
+          {...(reportDialog.props as ReportDialogProps)}
+          location={sourceCode}
+          lang={lang}
+        />
       )}
     </Wrapper>
   );

package/src/components/Feedback/Comment.tsx

@@ -22,14 +22,14 @@ export const Comment = ({
   const send = () => {
     if (!text) return;
     setSubmitValue(text);
-    onSubmit({ comment: text, path: window.location.href });
+    onSubmit({ comment: text });
   };
   const handleTextAreaChange = (e: any) => {
     const commentValue = e.target.value;
     setText(commentValue);
 
     if (!standAlone) {
-      onSubmit({ comment: commentValue, path: window.location.href });
+      onSubmit({ comment: commentValue });
     }
   };
 

package/src/components/Feedback/Mood.tsx

@@ -57,7 +57,6 @@ export const Mood = ({ settings, onSubmit, className }: MoodProps): JSX.Element
       score: remapScore(score),
       comment,
       reasons,
-      path: window.location.href,
     });
     setIsSubmitted(true);
   };

package/src/components/Feedback/Rating.tsx

@@ -27,7 +27,6 @@ export const Rating = ({ settings, onSubmit, className }: RatingProps): JSX.Elem
       comment,
       reasons,
       max: FEEDBACK_MAX_RATING,
-      path: window.location.href,
     });
     setIsSubmitted(true);
   };

package/src/components/Feedback/ReportDialog.tsx

@@ -12,16 +12,17 @@ export const ReportDialog = ({
   onSubmit,
   onCancel,
   submitFeedback,
+  lang,
 }: ReportDialogProps): JSX.Element => {
   const { label } = settings;
   const { pathname } = useLocation();
 
   return (
-    <Wrapper className="modal">
+    <Wrapper className="modal scroll-lock">
       <Comment
         settings={{ label }}
         onSubmit={async (value) => {
-          await submitFeedback({ type: 'problem', values: value, location, path: pathname });
+          await submitFeedback({ type: 'problem', values: value, location, path: pathname, lang });
           telemetry.send('code_snippet_reported', {});
           onSubmit();
         }}

package/src/components/Feedback/Scale.tsx

@@ -51,7 +51,6 @@ export const Scale = ({ settings, onSubmit, className }: ScaleProps): JSX.Elemen
       comment,
       reasons,
       max: MAX_SCALE,
-      path: window.location.href,
     });
     setIsSubmitted(true);
   };

package/src/components/Feedback/Sentiment.tsx

@@ -34,7 +34,6 @@ export const Sentiment = ({ settings, onSubmit, className }: SentimentProps): JS
       score,
       comment,
       reasons,
-      path: window.location.href,
     });
     setIsSubmitted(true);
   };

package/src/components/Feedback/types.ts

@@ -1,13 +1,7 @@
 import type { SubmitFeedbackParams } from '@theme/types/portal/src/shared/types/feedback';
 
 export type RatingProps = {
-  onSubmit: (value: {
-    score: number;
-    comment?: string;
-    reasons?: string[];
-    max: number;
-    path?: string;
-  }) => void;
+  onSubmit: (value: { score: number; comment?: string; reasons?: string[]; max: number }) => void;
   settings?: {
     label?: string;
     submitText?: string;
@@ -26,13 +20,7 @@ export type RatingProps = {
 };
 
 export type ScaleProps = {
-  onSubmit: (value: {
-    score: number;
-    comment?: string;
-    reasons?: string[];
-    max?: number;
-    path?: string;
-  }) => void;
+  onSubmit: (value: { score: number; comment?: string; reasons?: string[]; max?: number }) => void;
   settings?: {
     label?: string;
     submitText?: string;
@@ -53,7 +41,7 @@ export type ScaleProps = {
 };
 
 export type MoodProps = {
-  onSubmit: (value: { score: number; comment?: string; reasons?: string[]; path?: string }) => void;
+  onSubmit: (value: { score: number; comment?: string; reasons?: string[] }) => void;
   settings?: {
     label?: string;
     submitText?: string;
@@ -74,7 +62,7 @@ export type MoodProps = {
 };
 
 export type SentimentProps = {
-  onSubmit: (value: { score: number; comment?: string; reasons?: string[]; path?: string }) => void;
+  onSubmit: (value: { score: number; comment?: string; reasons?: string[] }) => void;
   settings?: {
     label?: string;
     submitText?: string;
@@ -94,7 +82,7 @@ export type SentimentProps = {
 };
 
 export type CommentProps = {
-  onSubmit: (value: { comment: string; path?: string }) => void;
+  onSubmit: (value: { comment: string }) => void;
   onCancel?: () => unknown;
   settings?: {
     label?: string;
@@ -116,6 +104,7 @@ export type ReasonsProps = {
 
 export type ReportDialogProps = {
   location: string;
+  lang?: string;
   onSubmit: () => void;
   onCancel: () => void;
   settings: {

package/src/components/Markdown/styledVariables.ts

@@ -235,11 +235,11 @@ export const markdown = css`
   --md-tabs-content-padding: var(--spacing-base) 0; // @presenter Spacing
   --md-tabs-content-border: none; // @presenter Border
 
-  --md-tabs-tab-text-color: var(--text-secondary); // @presenter Color
-  --md-tabs-tab-font-size: var(--font-size-base); // @presenter FontSize
+  --md-tabs-tab-text-color: var(--text-primary); // @presenter Color
+  --md-tabs-tab-font-size: var(--font-size-lg); // @presenter FontSize
   --md-tabs-tab-font-family: var(--font-size-base); // @presenter FontFamily
   --md-tabs-tab-font-style: normal; // @presenter FontStyle
-  --md-tabs-tab-font-weight: var(--font-weight-regular); // @presenter FontWeight
+  --md-tabs-tab-font-weight: var(--font-weight-bold); // @presenter FontWeight
   --md-tabs-tab-background-color: none; // @presenter Color
   --md-tabs-tab-margin: 0 0 -1px 0; // @presenter Spacing
   --md-tabs-tab-padding: var(--spacing-sm) var(--spacing-base); // @presenter Spacing
@@ -254,8 +254,8 @@ export const markdown = css`
   --md-tabs-active-tab-font-weight: var(--md-tabs-tab-font-weight); // @presenter FontWeight
   --md-tabs-active-tab-background-color: var(--background-color); // @presenter Color
   --md-tabs-active-tab-padding: var(--md-tabs-tab-padding); // @presenter Spacing
-  --md-tabs-active-tab-border-color: var(--border-primary); // @presenter Color
-  --md-tabs-active-tab-border-width: 0 0 1px 0; // @presenter Spacing
+  --md-tabs-active-tab-border-color: var(--text-base); // @presenter Color
+  --md-tabs-active-tab-border-width: 0 0 2px 0; // @presenter Spacing
   --md-tabs-active-tab-border-radius: var(--md-tabs-tab-border-radius); // @presenter BorderRadius
   
   --md-tabs-hover-tab-text-color: var(--md-tabs-tab-text-color); // @presenter Color
@@ -266,7 +266,7 @@ export const markdown = css`
   --md-tabs-hover-tab-background-color: var(--md-tabs-tab-background-color); // @presenter Color
   --md-tabs-hover-tab-padding: var(--md-tabs-tab-padding); // @presenter Spacing
   --md-tabs-hover-tab-border-color: var(--border-secondary); // @presenter Color
-  --md-tabs-hover-tab-border-width: 0 0 1px 0; // @presenter Spacing
+  --md-tabs-hover-tab-border-width: 0 0 1.5px 0; // @presenter Spacing
   --md-tabs-hover-tab-border-radius: var(--md-tabs-tab-border-radius); // @presenter BorderRadius
 
   // @tokens End

package/src/globalStyle.ts

@@ -912,7 +912,7 @@ const error = css`
 `;
 
 const modal = css`
-  body:has(.modal) {
+  body:has(.scroll-lock) {
     overflow: hidden;
   }
 

package/src/types/portal/src/shared/types/feedback.ts

@@ -1,15 +1,22 @@
 import type { FEEDBACK_TYPES } from '../constants';
 
-import type {RatingProps, SentimentProps, CommentProps, MoodProps, ScaleProps} from '@theme/components/Feedback';
+import type {
+  RatingProps,
+  SentimentProps,
+  CommentProps,
+  MoodProps,
+  ScaleProps,
+} from '@theme/components/Feedback';
 
 export type SubmitFeedbackParams = {
   type: string;
   values: Record<string, unknown>;
   path?: string;
   location?: string;
+  lang?: string;
 };
 
 export type FeedbackProps = {
   type: FEEDBACK_TYPES;
   settings: (RatingProps | SentimentProps | CommentProps | MoodProps | ScaleProps)['settings'];
-}
+};