Fix merge conflicts

epam · Mar 22, 2024 · 1a11c12 · 1a11c12
1 parent 695490a
commit 1a11c12
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/app/src/documents/structureComponents.ts b/app/src/documents/structureComponents.ts
@@ -39,7 +39,8 @@ import {
     RadioGroupDoc,
     RadioInputDoc,
     RangeDatePickerDoc,
-    RatingDoc, RichTextEditorDoc,
+    RatingDoc,
+    RichTextEditorDoc,
     RichTextViewDoc, ScrollSpyDoc,
     SearchInputDoc,
     SliderDoc,
@@ -56,6 +57,7 @@ import {
     useTableStateDoc, VerticalTabButtonDoc, VirtualListDoc,
 } from '../docs';
 import { AnchorDoc } from '../docs/anchor/Anchor.doc';
+import { RichTextEditorSerializersDoc } from '../docs/RichTextEditorSerializers.doc';
 
 export const componentsStructure = sortBy(
     [
@@ -79,6 +81,11 @@ export const componentsStructure = sortBy(
         { id: 'flexRow', name: 'Flex Row', component: FlexRowDoc, parentId: 'flexItems', order: 2 },
         { id: 'flexCell', name: 'Flex Cell', component: FlexCellDoc, parentId: 'flexItems', order: 3 },
         { id: 'flexSpacer', name: 'Flex Spacer', component: FlexSpacerDoc, parentId: 'flexItems', order: 4 },
+
+        { id: 'richTextEditor', name: 'Rich Text Editor', parentId: 'components', tags: ['RTE', 'RichTextEditor'] },
+        { id: 'rteOverview', name: 'Overview', component: RichTextEditorDoc, parentId: 'richTextEditor', order: 1, tags: ['RTE', 'RichTextEditor'] },
+        { id: 'rteSerializers', name: 'Serializers', component: RichTextEditorSerializersDoc, parentId: 'richTextEditor', order: 2, tags: ['RTE', 'RichTextEditor'] },
+
         { id: 'iconButton', name: 'Icon Button', component: IconButtonDoc, parentId: 'components' },
         { id: 'iconContainer', name: 'Icon Container', component: IconContainerDoc, parentId: 'components' },
         { id: 'countIndicator', name: 'Count Indicator', component: CountIndicatorDoc, parentId: 'components' },
@@ -91,14 +98,14 @@ export const componentsStructure = sortBy(
         { id: 'notificationCard', name: 'Notification Card', component: NotificationCardDoc, parentId: 'components' },
         { id: 'numericInput', name: 'Numeric Input', component: NumericInputDoc, parentId: 'components' },
         { id: 'paginator', name: 'Paginator', component: PaginatorDoc, parentId: 'components' },
-        { id: 'pickerInput', name: 'Picker Input', component: PickerInputDoc, parentId: 'components' },
-        { id: 'pickerModal', name: 'Picker Modal', component: PickerModalDoc, parentId: 'components' },
-        { id: 'PickerList', name: 'Picker List', component: PickerListDoc, parentId: 'components' },
+        { id: 'pickerInput', name: 'Picker Input', component: PickerInputDoc, parentId: 'components', tags: ['PickerInput'] },
+        { id: 'pickerModal', name: 'Picker Modal', component: PickerModalDoc, parentId: 'components', tags: ['PickerList'] },
+        { id: 'PickerList', name: 'Picker List', component: PickerListDoc, parentId: 'components', tags: ['PickerModal'] },
         { id: 'radioGroup', name: 'Radio Group', component: RadioGroupDoc, parentId: 'components' },
         { id: 'radioInput', name: 'Radio Input', component: RadioInputDoc, parentId: 'components' },
         { id: 'rangeDatePicker', name: 'Range Date Picker', component: RangeDatePickerDoc, parentId: 'components' },
         { id: 'rating', name: 'Rating', component: RatingDoc, parentId: 'components' },
-        { id: 'richTextView', name: 'Rich Text View', component: RichTextViewDoc, parentId: 'components' },
+        { id: 'richTextView', name: 'RichTextView', component: RichTextViewDoc, parentId: 'components' },
         { id: 'searchInput', name: 'Search Input', component: SearchInputDoc, parentId: 'components' },
         { id: 'slider', name: 'Slider', component: SliderDoc, parentId: 'components' },
         { id: 'sliderRating', name: 'Slider Rating', component: SliderRatingDoc, parentId: 'components' },
@@ -119,8 +126,7 @@ export const componentsStructure = sortBy(
         { id: 'textPlaceholder', name: 'Text Placeholder', component: TextPlaceholderDoc, parentId: 'components' },
         { id: 'timePicker', name: 'Time Picker', component: TimePickerDoc, parentId: 'components' },
         { id: 'tooltip', name: 'Tooltip', component: TooltipDoc, parentId: 'components' },
-        { id: 'richTextEditor', name: 'Rich Text Editor', component: RichTextEditorDoc, parentId: 'components' },
-        { id: 'form', name: 'Form', component: FormDoc, parentId: 'components' },
+        { id: 'form', name: 'Form', component: FormDoc, parentId: 'components', tags: ['useForm'] },
         { id: 'fileUpload', name: 'File Upload', component: FileUploadDoc, parentId: 'components' },
         { id: 'verticalTabButton', name: 'Vertical Tab Button', component: VerticalTabButtonDoc, parentId: 'components' },
         { id: 'virtualList', name: 'Virtual List', component: VirtualListDoc, parentId: 'components' },