@redneckz/wildless-cms-uni-blocks 0.6.18 → 0.6.19

package/src/components/TariffsTable/TariffsTableRow.tsx

@@ -1,6 +1,8 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { Img } from '../../ui-kit/Img/Img';
+import type { TariffsTableInnerContent } from '../../ui-kit/InnerTable/InnerTableProps';
 import { TableCarouselContainer } from '../ComparisonTable/TableCarouselContainer';
 import { COLUMN_WIDTH, DIVIDER_CLASSES, FIRST_CELL_CLASSES } from './constants';
 import { TariffsTableCell } from './TariffsTableCell';
@@ -10,19 +12,23 @@ import { TariffsTableRowContainer } from './TariffsTableRowContainer';
 export interface TariffsTableRowProps extends UniBlockProps {
   row: Data;
   activeCardIndex: number;
-  isLastRow: boolean;
   rowIdx: number;
 }
 
 export const TariffsTableRow = JSX<TariffsTableRowProps>(
-  ({ row: { header, data }, activeCardIndex, isLastRow, context, rowIdx }) => {
+  ({ row: { header, data }, activeCardIndex, context, rowIdx }) => {
+    const [tableInner, setTableInner] = useState<TariffsTableInnerContent | undefined>(undefined);
+    const [openTableInnerIdx, setOpenTableInnerIdx] = useState<number | undefined>(undefined);
+
+    const onHideContentClick = () => setTableInner(undefined);
+
     return (
-      <TariffsTableRowContainer context={context} rowIdx={rowIdx}>
-        <div
-          className={`text-s py-5 ${FIRST_CELL_CLASSES} ${DIVIDER_CLASSES} ${
-            !isLastRow ? 'border-solid' : ''
-          }`}
-        >
+      <TariffsTableRowContainer
+        context={context}
+        onHideContentClick={onHideContentClick}
+        tableInner={tableInner}
+      >
+        <div className={`text-s py-5 ${FIRST_CELL_CLASSES} ${DIVIDER_CLASSES}`}>
           <div className="flex items-center text-primary-text" role="cell">
             {header?.icon ? (
               <Img
@@ -46,10 +52,13 @@ export const TariffsTableRow = JSX<TariffsTableRowProps>(
               <TariffsTableCell
                 key={String(i)}
                 cells={cells}
-                isLastRow={isLastRow}
                 rowIdx={rowIdx}
                 cellIdx={i}
                 context={context}
+                setTableInner={setTableInner}
+                tableInner={tableInner}
+                openTableInnerIdx={openTableInnerIdx}
+                setOpenTableInnerIdx={setOpenTableInnerIdx}
               />
             ))}
           </TableCarouselContainer>

package/src/components/TariffsTable/TariffsTableRowContainer.tsx

@@ -1,6 +1,4 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { EventBus } from '../../EventBus/EventBus';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import type { VNode } from '../../model/VNode';
 import { InnerTable } from '../../ui-kit/InnerTable/InnerTable';
@@ -8,31 +6,18 @@ import type { TariffsTableInnerContent } from '../../ui-kit/InnerTable/InnerTabl
 
 export interface TariffsTableRowContainerProps extends UniBlockProps {
   children?: VNode;
-  rowIdx: number;
+  onHideContentClick: () => void;
+  tableInner?: TariffsTableInnerContent;
 }
 
 export const TariffsTableRowContainer = JSX<TariffsTableRowContainerProps>(
-  ({ context, children, rowIdx }) => {
-    const [tableInnerData, setTableInnerData] = useState<TariffsTableInnerContent | undefined>(
-      undefined,
-    );
-
-    useEffect(
-      () =>
-        EventBus.inst.subscribe('tariffInnerTable', (event) => {
-          setTableInnerData(
-            rowIdx === event.rowIdx ? { dataUrl: event.dataUrl, pdfUrl: event.pdfUrl } : undefined,
-          );
-        }),
-      [rowIdx],
-    );
-
+  ({ context, children, tableInner, onHideContentClick }) => {
     return (
       <div className="self-start flex flex-col" role="row">
         <div className="flex">{children}</div>
-        {tableInnerData ? (
+        {tableInner ? (
           <div className="origin-top animate-expansion">
-            <InnerTable context={context} {...tableInnerData} />
+            <InnerTable context={context} {...tableInner} onClick={onHideContentClick} />
           </div>
         ) : null}
       </div>

package/src/components/TariffsTable/TariffsTableTileCell.tsx

@@ -39,5 +39,7 @@ const renderCell = (cell: CellDef, context: ContentPageContext) => {
 
   const EmbeddableCellInner = EmbeddableCellData[type];
 
-  return <EmbeddableCellInner context={context} {...rest} />;
+  return (
+    <EmbeddableCellInner context={context} displayTable={() => null} {...rest} isVisible={true} />
+  );
 };

package/src/ui-kit/InnerTable/InnerTable.tsx

@@ -7,9 +7,13 @@ import { TableInnerButton } from './InnerTableButton';
 import { InnerTableHeader } from './InnerTableHeader';
 import type { TableFetchData, TariffsTableInnerContent } from './InnerTableProps';
 
-export interface InnerTableProps extends TariffsTableInnerContent, UniBlockProps {}
+export interface InnerTableProps extends TariffsTableInnerContent, UniBlockProps {
+  onClick: () => void;
+}
 
-export const InnerTable = JSX<InnerTableProps>(({ context, dataUrl, pdfUrl }) => {
+const EMPTY_DATA = 'Данных нет';
+
+export const InnerTable = JSX<InnerTableProps>(({ context, dataUrl, pdfUrl, onClick }) => {
   const { tableData }: TableFetchData = useTariffsInnerTableData(dataUrl);
 
   const [activeTabIndex, setActiveTabIndex] = useState(0);
@@ -26,7 +30,12 @@ export const InnerTable = JSX<InnerTableProps>(({ context, dataUrl, pdfUrl }) =>
         linkToPDF={pdfUrl} //TODO: need link to service
       />
       <InnerTableBody context={context} activeTabIndex={activeTabIndex} items={items} />
-      <TableInnerButton context={context} isOpen />
+      <TableInnerButton context={context} onClick={onClick} isOpen />
+    </div>
+  ) : (
+    <div className="my-5 text-h6 text-center">
+      <p>{EMPTY_DATA}</p>
+      <TableInnerButton context={context} onClick={onClick} isOpen />
     </div>
-  ) : null;
+  );
 });

package/src/ui-kit/InnerTable/InnerTableButton.tsx

@@ -1,36 +1,30 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { EventBus } from '../../EventBus/EventBus';
 import type { UniBlockProps } from '../../model/JSXBlock';
 import { Button } from '../Button/Button';
 import { Icon } from '../Icon/Icon';
 import type { TariffsTableInnerEvent } from './InnerTableProps';
 
 export interface TableInnerButtonProps extends TariffsTableInnerEvent, UniBlockProps {
+  onClick?: () => void;
   isOpen?: boolean;
 }
 
-export const TableInnerButton = JSX<TableInnerButtonProps>(
-  ({ isOpen, dataUrl, pdfUrl, rowIdx, cellIdx, fieldIdx }) => {
-    const handleClick = () => {
-      EventBus.inst.fire('tariffInnerTable', { dataUrl, pdfUrl, rowIdx, cellIdx, fieldIdx });
-    };
-
-    return (
-      <Button
-        version="primary"
-        onClick={handleClick}
-        className="w-full flex items-center justify-center rounded-none py-5"
-      >
-        <div className="text-h4">{isOpen ? 'Скрыть' : 'Показать ставки по вкладу'}</div>
-        <Icon
-          name={isOpen ? 'ArrowUpIcon' : 'ArrowDownIcon'}
-          className="ml-3"
-          iconVersion="white"
-          width="20"
-          height="20"
-          asSVG
-        />
-      </Button>
-    );
-  },
-);
+export const TableInnerButton = JSX<TableInnerButtonProps>(({ isOpen, onClick }) => {
+  return (
+    <Button
+      version="primary"
+      onClick={onClick}
+      className="w-full flex items-center justify-center rounded-none py-5"
+    >
+      <div className="text-h4">{isOpen ? 'Скрыть' : 'Показать ставки по вкладу'}</div>
+      <Icon
+        name={isOpen ? 'ArrowUpIcon' : 'ArrowDownIcon'}
+        className="ml-3"
+        iconVersion="white"
+        width="20"
+        height="20"
+        asSVG
+      />
+    </Button>
+  );
+});

package/src/ui-kit/InputRange/InputRange.tsx

@@ -33,7 +33,7 @@ export const InputRange = JSX<InputRangeProps>(
     return (
       <div className={className}>
         <label className="block relative">
-          {title ? <span className="text-m-light">{title}</span> : null}
+          {title ? <span className="text-m-light text-primary-text">{title}</span> : null}
           <input
             className={`m-0 mt-2 font-sans text-h3 w-full h-14 border border-solid border-main-stroke rounded-md
             outline-none p-0 pl-4 box-border text-primary-text hover:border-primary-hover focus:border-primary-focus ${DISABLED_INPUT_CLASSES}`}

package/src/ui-kit/Radio/Radio.tsx

@@ -3,7 +3,7 @@ import { RadioProps } from './RadioProps';
 
 export const Radio = JSX<RadioProps>(({ name, text, value, checked, onChange, className }) => (
   <div className={className}>
-    <label className="flex items-center relative cursor-pointer">
+    <label className="font-sans flex items-center relative cursor-pointer">
       <input
         className="appearance-none flex justify-center items-center shrink-0 w-5 h-5 border border-gray hover:border-checkbox-hover
         checked:border-2 checked:!border-primary-main focus:checked:border-primary-main focus:border-primary-text active:border-primary-text
@@ -14,7 +14,7 @@ export const Radio = JSX<RadioProps>(({ name, text, value, checked, onChange, cl
         checked={checked}
         onChange={onChange}
       />
-      {text ? <span className="font-sans ml-3 cursor-pointer">{text}</span> : null}
+      {text ? <span className="text-primary-text ml-3 cursor-pointer">{text}</span> : null}
     </label>
   </div>
 ));

package/src/ui-kit/Select/Select.tsx

@@ -41,7 +41,7 @@ export const Select = JSX<SelectProps>(
 
     return (
       <div className={`${className}`} ref={wrapperRef}>
-        {label ? <span className="mb-2 flex">{label}</span> : null}
+        {label ? <span className="mb-2 flex text-primary-text">{label}</span> : null}
         <div className={`relative ${isOpen ? 'z-20' : 'z-10'}`}>
           <div
             className={`text-l flex justify-between items-center mb-0.5 text-primary-text cursor-pointer