Merge branch 'main' into feat-up-tabs

Author: makhnatkin

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [13.25.1](https://github.com/gravity-ui/markdown-editor/compare/v13.25.0...v13.25.1) (2024-10-18)
+
+
+### Bug Fixes
+
+* generics in GPT ([#425](https://github.com/gravity-ui/markdown-editor/issues/425)) ([e24aa27](https://github.com/gravity-ui/markdown-editor/commit/e24aa274c15edfb8a0d6ee3e10282ceeb098bbad))
+* **yfmCut:** reverted details, summary tags ([#431](https://github.com/gravity-ui/markdown-editor/issues/431)) ([8be5211](https://github.com/gravity-ui/markdown-editor/commit/8be5211001bd3023bd9fb9472239466b9a8199d0))
+
 ## [13.25.0](https://github.com/gravity-ui/markdown-editor/compare/v13.24.0...v13.25.0) (2024-10-15)
 
 

demo/YFM.stories.tsx

@@ -54,6 +54,17 @@ This is an alert.
 Content displayed when clicked.
 
 {% endcut %}
+
+{% cut "Cut with nested сut header" %}
+
+{% cut "Cut header" %}
+
+Content displayed when clicked.
+
+{% endcut %}
+
+{% endcut %}
+
 `.trim(),
 
     yfmTabs: `

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/markdown-editor",
-  "version": "13.25.0",
+  "version": "13.25.1",
   "description": "Markdown wysiwyg and markup editor",
   "license": "MIT",
   "repository": {

package.json

@@ -1,4 +1,3 @@
-import type {FC} from 'react';
 import React, {useCallback, useRef, useState} from 'react';
 
 import {ArrowRight, ArrowRotateLeft, ThumbsDown, ThumbsUp} from '@gravity-ui/icons';
@@ -50,7 +49,10 @@ export type GptDialogProps<
 
 export const cnGptDialog = cn('gpt-dialog');
 
-export const GptDialog: FC<GptDialogProps> = ({
+export const GptDialog = <
+    AnswerData extends CommonAnswer = CommonAnswer,
+    PromptData extends unknown = unknown,
+>({
     markup,
     answerRender,
     promptPresets,
@@ -66,7 +68,7 @@ export const GptDialog: FC<GptDialogProps> = ({
     onDislike,
     onUpdate,
     gptAlertProps,
-}) => {
+}: GptDialogProps<AnswerData, PromptData>) => {
     const {
         answer,
         customPrompt,

src/extensions/additional/GPT/GptDialog/GptDialog.tsx

@@ -1,6 +1,7 @@
 import {keymap} from '@codemirror/view';
 
 import {GptWidgetOptions} from '../../..';
+import {CommonAnswer} from '../ErrorScreen/types';
 import {gptHotKeys} from '../constants';
 
 import {runMarkupGpt} from './commands';
@@ -9,7 +10,10 @@ import {mGptPlugin} from './plugin';
 export {mGptToolbarItem} from './toolbar';
 export {showMarkupGpt, hideMarkupGpt} from './commands';
 
-export function mGptExtension(props: GptWidgetOptions) {
+export function mGptExtension<
+    AnswerData extends CommonAnswer = CommonAnswer,
+    PromptData extends unknown = unknown,
+>(props: GptWidgetOptions<AnswerData, PromptData>) {
     return [
         mGptPlugin(props).extension,
         keymap.of([

src/extensions/additional/GPT/MarkupGpt/index.ts

@@ -10,6 +10,7 @@ import {
     type ViewUpdate,
 } from '../../../../cm/view';
 import {ReactRendererFacet} from '../../../../markup';
+import {CommonAnswer} from '../ErrorScreen/types';
 import {WIDGET_DECO_CLASS_NAME} from '../constants';
 import {isEmptyGptPrompts} from '../utils';
 
@@ -35,7 +36,10 @@ class SpanWidget extends WidgetType {
     }
 }
 
-export function mGptPlugin(gptProps: GptWidgetOptions) {
+export function mGptPlugin<
+    AnswerData extends CommonAnswer = CommonAnswer,
+    PromptData extends unknown = unknown,
+>(gptProps: GptWidgetOptions<AnswerData, PromptData>) {
     return ViewPlugin.fromClass(
         class implements PluginValue {
             readonly _view: EditorView;

src/extensions/additional/GPT/MarkupGpt/plugin.ts

@@ -6,16 +6,19 @@ import {CommonAnswer} from '../ErrorScreen/types';
 import {GptDialog, GptDialogProps} from '../GptDialog/GptDialog';
 import {cnGptPopup} from '../gptExtension/view';
 
-type Props = {
+type Props<AnswerData extends CommonAnswer = CommonAnswer, PromptData extends unknown = unknown> = {
     onClose: () => void;
     markup: string;
     onConfirmOk?: () => void;
     onConfirmCancel?: () => void;
-} & GptDialogProps &
+} & GptDialogProps<AnswerData, PromptData> &
     Pick<PopupProps, 'anchorRef' | 'container'>;
 
-export function renderPopup(anchor: HTMLElement, props: Props) {
-    const handleUpdate = (result?: CommonAnswer) => props.onUpdate?.(result);
+export function renderPopup<
+    AnswerData extends CommonAnswer = CommonAnswer,
+    PromptData extends unknown = unknown,
+>(anchor: HTMLElement, props: Props<AnswerData, PromptData>) {
+    const handleUpdate = (result?: AnswerData) => props.onUpdate?.(result);
 
     return (
         <Popup

src/extensions/additional/GPT/MarkupGpt/popup.tsx

@@ -1,34 +1,47 @@
 import React from 'react';
-import type {FC} from 'react';
 
 import {ActionTooltip, Button, DropdownMenu} from '@gravity-ui/uikit';
 
 import {cn} from '../../../../classname';
 import {i18n} from '../../../../i18n/gpt/dialog';
-import {type PromptPreset} from '../ErrorScreen/types';
+import {CommonAnswer, type PromptPreset} from '../ErrorScreen/types';
 import type {GptDialogProps} from '../GptDialog/GptDialog';
 import {gptHotKeys} from '../constants';
 import {useGptHotKeys} from '../hooks/useGptHotKeys';
 import {usePresetList} from '../hooks/usePresetList';
 
 import './Presetlist.scss';
 
-export type PresetListProps<PromptData extends unknown = unknown> = {
-    disablePromptPresets: GptDialogProps['disablePromptPresets'];
-    promptPresets: GptDialogProps['promptPresets'];
-    onPresetClick: (data: PromptData) => void;
+export type PresetListProps<
+    AnswerData extends CommonAnswer = CommonAnswer,
+    PromptData extends unknown = unknown,
+> = {
+    disablePromptPresets: GptDialogProps<AnswerData, PromptData>['disablePromptPresets'];
+    promptPresets: GptDialogProps<AnswerData, PromptData>['promptPresets'];
+    onPresetClick: (data?: PromptData) => void;
 };
 
-type PresetItemType = {
-    preset: PromptPreset<unknown>;
-    onPresetClick: PresetListProps['onPresetClick'];
+type PresetItemType<
+    AnswerData extends CommonAnswer = CommonAnswer,
+    PromptData extends unknown = unknown,
+> = {
+    preset: PromptPreset<PromptData>;
+    onPresetClick: PresetListProps<AnswerData, PromptData>['onPresetClick'];
     disablePromptPresets?: PresetListProps['disablePromptPresets'];
     hotKey: string;
 };
 
 export const cnGptDialogPresetList = cn('gpt-dialog-preset-list');
 
-const PresetItem: FC<PresetItemType> = ({preset, onPresetClick, disablePromptPresets, hotKey}) => {
+const PresetItem = <
+    AnswerData extends CommonAnswer = CommonAnswer,
+    PromptData extends unknown = unknown,
+>({
+    preset,
+    onPresetClick,
+    disablePromptPresets,
+    hotKey,
+}: PresetItemType<AnswerData, PromptData>) => {
     useGptHotKeys(
         hotKey,
         () => {
@@ -52,13 +65,16 @@ const PresetItem: FC<PresetItemType> = ({preset, onPresetClick, disablePromptPre
     );
 };
 
-export const PresetList: FC<PresetListProps> = ({
+export const PresetList = <
+    AnswerData extends CommonAnswer = CommonAnswer,
+    PromptData extends unknown = unknown,
+>({
     disablePromptPresets,
     promptPresets,
     onPresetClick,
-}) => {
+}: PresetListProps<AnswerData, PromptData>) => {
     const {presetsContainerRef, visiblePresets, hiddenPresets, showMoreButton, measured} =
-        usePresetList({
+        usePresetList<AnswerData, PromptData>({
             promptPresets,
             onPresetClick,
         });

src/extensions/additional/GPT/PresetList/PresetList.tsx

@@ -1,5 +1,4 @@
-import {Action, ExtensionWithOptions} from 'src/core';
-
+import {Action, ExtensionBuilder} from '../../../../core';
 import type {CommonAnswer} from '../ErrorScreen/types';
 import {showGptWidget} from '../actions';
 import {runGpt} from '../commands';
@@ -31,7 +30,13 @@ export type GptWidgetOptions<
     | 'gptAlertProps'
 >;
 
-export const gptExtension: ExtensionWithOptions<GptWidgetOptions> = (builder, options) => {
+export const gptExtension = <
+    AnswerData extends CommonAnswer = CommonAnswer,
+    PromptData extends unknown = unknown,
+>(
+    builder: ExtensionBuilder,
+    options: GptWidgetOptions<AnswerData, PromptData>,
+) => {
     builder.addAction(gptActionName, showGptWidget);
     builder.addPlugin(({serializer, markupParser}) => {
         return gptWidgetPlugin({