@redneckz/wildless-cms-uni-blocks 0.6.26 → 0.6.27

package/mobile/src/ui-kit/Button/ButtonSection.tsx

@@ -1,30 +1,25 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useLink } from '../../hooks/useLink';
-import type { UniBlockProps } from '../../model/JSXBlock';
 import type { Picture } from '../../model/Picture';
 import { Img } from '../Img/Img';
 import { Button } from './Button';
 import type { ButtonContent, ButtonWithIconProps } from './ButtonProps';
 
-export interface ButtonSectionProps extends ButtonContent, UniBlockProps {}
+export interface ButtonSectionProps extends ButtonContent {
+  className?: string;
+}
 
 interface RenderButtonProps {
   button: ButtonWithIconProps;
   buttonClassName?: string;
   index?: number;
 }
-export const ButtonSection = JSX<ButtonSectionProps>(({ context, className = '', buttons }) => {
-  const { handlerDecorator } = context;
-  const router = context.useRouter();
-
-  return buttons && buttons?.length ? (
+export const ButtonSection = JSX<ButtonSectionProps>(({ className = '', buttons }) =>
+  buttons && buttons?.length ? (
     <div className={className}>
-      {buttons.map((button, index) =>
-        renderButton({ button: useLink({ router, handlerDecorator }, button), index }),
-      )}
+      {buttons.map((button, index) => renderButton({ button, index }))}
     </div>
-  ) : null;
-});
+  ) : null,
+);
 
 export function renderButton({ button, buttonClassName, index }: RenderButtonProps) {
   const { icon, iconRight, version, ...rest } = button;
@@ -36,11 +31,11 @@ export function renderButton({ button, buttonClassName, index }: RenderButtonPro
 
   return (
     <Button
+      key={index ? String(index) : ''}
       className={buttonClassName}
       appendLeft={leftIcon}
       appendRight={rightIcon}
       version={version}
-      key={index ? String(index) : ''}
       {...rest}
     />
   );

package/mobile/src/ui-kit/Checkbox/Checkbox.tsx

@@ -21,9 +21,7 @@ export const Checkbox = JSX<CheckboxProps>(({ className, text, checked, isRadio,
         ${checked ? 'border-black' : 'border-main-stroke'}
         checked:border-primary-main m-0`}
           type="checkbox"
-          onChange={(e) => {
-            onChange(e.target.checked as boolean);
-          }}
+          onChange={(e) => onChange && onChange(e.target.checked as boolean)}
           checked={checked}
         />
         {isRadio ? (

package/mobile/src/ui-kit/Checkbox/CheckboxProps.ts

@@ -1,7 +1,7 @@
 export interface CheckboxProps {
   text?: string;
-  checked: boolean;
+  checked?: boolean;
   className?: string;
   isRadio?: boolean;
-  onChange: (value: boolean) => void;
+  onChange?: (value: boolean) => void;
 }

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

@@ -1,19 +1,18 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useTariffsInnerTableData } from '../../hooks/useTariffsInnerTableData';
-import type { UniBlockProps } from '../../model/JSXBlock';
 import { InnerTableBody } from './InnerTableBody';
 import { TableInnerButton } from './InnerTableButton';
 import { InnerTableHeader } from './InnerTableHeader';
 import type { TableFetchData, TariffsTableInnerContent } from './InnerTableProps';
 
-export interface InnerTableProps extends TariffsTableInnerContent, UniBlockProps {
-  onClick: () => void;
+export interface InnerTableProps extends TariffsTableInnerContent {
+  onClick?: () => void;
 }
 
 const EMPTY_DATA = 'Данных нет';
 
-export const InnerTable = JSX<InnerTableProps>(({ context, dataUrl, pdfUrl, onClick }) => {
+export const InnerTable = JSX<InnerTableProps>(({ dataUrl, pdfUrl, onClick }) => {
   const { tableData }: TableFetchData = useTariffsInnerTableData(dataUrl);
 
   const [activeTabIndex, setActiveTabIndex] = useState(0);
@@ -29,13 +28,13 @@ export const InnerTable = JSX<InnerTableProps>(({ context, dataUrl, pdfUrl, onCl
         setActiveTabIndex={setActiveTabIndex}
         linkToPDF={pdfUrl} //TODO: need link to service
       />
-      <InnerTableBody context={context} activeTabIndex={activeTabIndex} items={items} />
-      <TableInnerButton context={context} onClick={onClick} isOpen />
+      <InnerTableBody activeTabIndex={activeTabIndex} items={items} />
+      <TableInnerButton onClick={onClick} isOpen />
     </div>
   ) : (
     <div className="my-5 text-h6 text-center">
       <p>{EMPTY_DATA}</p>
-      <TableInnerButton context={context} onClick={onClick} isOpen />
+      <TableInnerButton onClick={onClick} isOpen />
     </div>
   );
 });

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

@@ -1,16 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import type { UniBlockProps } from '../../model/JSXBlock';
 import { Img } from '../Img/Img';
 import { InnerTableBodyItem } from './InnerTableBodyItem';
 import type { DataItem } from './InnerTableProps';
 
-export interface InnerTableBodyProps extends UniBlockProps {
+export interface InnerTableBodyProps {
   activeTabIndex: number;
   items: DataItem[];
 }
 
-export const InnerTableBody = JSX<InnerTableBodyProps>(({ context, activeTabIndex, items }) => {
+export const InnerTableBody = JSX<InnerTableBodyProps>(({ activeTabIndex, items }) => {
   const [hiddenTables, setHiddenTables] = useState<Record<string, boolean>>({});
 
   const toggleTable = (key: string) => {
@@ -42,7 +41,7 @@ export const InnerTableBody = JSX<InnerTableBodyProps>(({ context, activeTabInde
               }`}
             >
               <div className="relative">
-                <InnerTableBodyItem context={context} rows={_.rowsData} />
+                <InnerTableBodyItem rows={_.rowsData} />
               </div>
             </div>
           </div>

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

@@ -1,12 +1,11 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useState } from '@redneckz/uni-jsx/lib/hooks';
-import type { UniBlockProps } from '../../model/JSXBlock';
 import { renderArrows } from '../Button/renderArrows';
 import type { RowsData } from './InnerTableProps';
 
 const COLUMN_WIDTH = 140;
 
-export interface InnerTableBodyItemProps extends UniBlockProps {
+export interface InnerTableBodyItemProps {
   rows?: RowsData[][];
 }
 

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

@@ -1,10 +1,9 @@
 import { JSX } from '@redneckz/uni-jsx';
-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 {
+export interface TableInnerButtonProps extends TariffsTableInnerEvent {
   onClick?: () => void;
   isOpen?: boolean;
 }

package/mobile/src/ui-kit/RadioButtonGroup/RadioButtonGroup.tsx

@@ -1,32 +1,29 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps } from '../../model/JSXBlock';
 import { Checkbox } from '../Checkbox/Checkbox';
 
 export interface RadioButtonItem {
   id: string;
-  text: string;
+  text?: string;
 }
 
-interface RadioButtonGroupProps extends UniBlockProps {
-  items: RadioButtonItem[];
+interface RadioButtonGroupProps {
+  items?: RadioButtonItem[];
   checkedItem?: string;
-  onChangeCheckedItem: (id: string) => void;
+  onChange?: (id: string) => void;
 }
 
 export const RadioButtonGroup = JSX<RadioButtonGroupProps>(
-  ({ items, checkedItem, onChangeCheckedItem }) => {
-    return (
-      <div className="flex flex-col gap-3">
-        {items?.map(({ id, text }) => (
-          <Checkbox
-            key={id}
-            isRadio
-            text={text}
-            checked={checkedItem === id}
-            onChange={() => onChangeCheckedItem(id)}
-          />
-        ))}
-      </div>
-    );
-  },
+  ({ items, checkedItem, onChange: onChangeCheckedItem }) => (
+    <div className="flex flex-col gap-3">
+      {items?.map(({ id, text }) => (
+        <Checkbox
+          key={String(id)}
+          isRadio
+          text={text}
+          checked={checkedItem === id}
+          onChange={() => onChangeCheckedItem && onChangeCheckedItem(id)}
+        />
+      ))}
+    </div>
+  ),
 );

package/mobile/src/ui-kit/SearchBar/SearchBar.tsx

@@ -1,7 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps } from '../../model/JSXBlock';
-import { SearchBarInner } from './SearchBarInner';
+import { SearchBarInner, SearchBarInnerProps } from './SearchBarInner';
 
-export const SearchBar = JSX<UniBlockProps>(({ className = '' }) => {
-  return <SearchBarInner className={className} isMobile={true} />;
-});
+export const SearchBar = JSX<SearchBarInnerProps>((props) => (
+  <SearchBarInner {...props} isMobile={true} />
+));

package/mobile/src/ui-kit/SwipeListControl/SwipeListControl.tsx

@@ -10,11 +10,11 @@ import { getScrollPoints } from './utils/getScrollPoints';
 export const SwipeListControl = JSX<SwipeListControlProps>(
   ({
     className,
-    children,
     gap = DEFAULT_GAP,
     padding = DEFAULT_PADDING,
     showDots = true,
     onSlideChange,
+    children,
   }) => {
     const [activeIndex, setActiveIndex] = useState(0);
     const [indexFraction, setIndexFraction] = useState(0);

package/mobile/src/ui-kit/SwipeListControl/SwipeListControlProps.ts

@@ -1,5 +1,3 @@
-import type { UniBlockProps } from '../../model/JSXBlock';
-
 /**
  * @title Контейнер
  */
@@ -13,7 +11,8 @@ export interface SwipeContainer {
 /**
  * @title Swipe-контроллер
  */
-export interface SwipeListControlProps extends SwipeContainer, UniBlockProps {
+export interface SwipeListControlProps extends SwipeContainer {
+  className?: string;
   /** @title Точки-индикаторы */
   showDots?: boolean;
   onSlideChange?: () => void;

package/mobile/src/ui-kit/TableArrowScrollControl/TableArrowScrollControl.tsx

@@ -3,11 +3,11 @@ import { renderArrows } from '../Button/renderArrows';
 import type { TableArrowScrollControlProps } from './TableArrowScrollControlProps';
 
 export const TableArrowScrollControl = JSX<TableArrowScrollControlProps>(
-  ({ isScrollAvailable, handleNextClick, handlePrevClick, showNextButton, showPrevButton }) => {
+  ({ isScrollAvailable, onNextClick, onPrevClick, showNextButton, showPrevButton }) => {
     return isScrollAvailable ? (
       <div>
         {renderArrows({
-          handler: [handlePrevClick, handleNextClick],
+          handler: [onPrevClick, onNextClick],
           isShown: [showPrevButton, showNextButton],
           btnClass: ['top-[108px]', 'top-11'],
           className: 'right-7',

package/mobile/src/ui-kit/TableArrowScrollControl/TableArrowScrollControlProps.ts

@@ -1,7 +1,8 @@
 export interface TableArrowScrollControlProps {
+  activeCardIndex: number;
+  onNextClick: () => void;
+  onPrevClick: () => void;
   isScrollAvailable?: boolean;
-  handleNextClick: () => void;
-  handlePrevClick: () => void;
   showNextButton: boolean;
   showPrevButton: boolean;
 }

package/mobile/src/ui-kit/TopItem/TopItem.tsx

@@ -1,4 +1,5 @@
 import { JSX } from '@redneckz/uni-jsx';
+import { useLink } from '../../hooks/useLink';
 import type { BgColorVersion } from '../../model/BgColorVersion';
 import type { LinkProps } from '../../model/LinkProps';
 
@@ -19,29 +20,23 @@ const TEXT_CLASSES = 'font-sans text-s-light';
 const LINK_CLASSES = 'inline-block border border-solid bg-transparent text-center no-underline';
 
 export const TopItem = JSX<TopItemProps>(
-  ({
-    className = '',
-    text,
-    href,
-    target,
-    active,
-    flat,
-    onClick,
-    children,
-    ariaLabel,
-    bgColor = 'bg-white',
-  }) => (
-    <a
-      className={`${getLinkClasses(bgColor, active, flat)} ${className}`}
-      href={href}
-      target={target}
-      onClick={onClick}
-      rel="noopener noreferrer"
-      aria-label={ariaLabel}
-    >
-      <span className={getTextClasses(bgColor, active, flat)}>{text || children}</span>
-    </a>
-  ),
+  ({ className = '', active, flat, ariaLabel, bgColor = 'bg-white', children, ...rest }) => {
+    const link = useLink();
+    const { href, target, text, onClick } = link(rest);
+
+    return (
+      <a
+        className={`${getLinkClasses(bgColor, active, flat)} ${className}`}
+        href={href}
+        target={target}
+        onClick={onClick}
+        rel="noopener noreferrer"
+        aria-label={ariaLabel}
+      >
+        <span className={getTextClasses(bgColor, active, flat)}>{text || children}</span>
+      </a>
+    );
+  },
 );
 
 const getLinkClasses = (bgColor: BgColorVersion, active = false, flat = false) => {

package/mobile/src/utils/adjustHref.ts

@@ -1,5 +1,4 @@
-import { getOrigin, isURL } from './url';
-import { MOBILE_URL_PATH } from './withoutMobilePath';
+import { getOrigin } from './url';
 
 export const adjustHref = (
   href: string | undefined,
@@ -9,18 +8,8 @@ export const adjustHref = (
     return href;
   }
 
-  const relativeHref = toRelativeHref(href, router) || '';
-  const isMobilePage = router?.pathname.startsWith(MOBILE_URL_PATH);
-
-  return isMobilePage && !isURL(relativeHref) ? `${MOBILE_URL_PATH}${relativeHref}` : relativeHref;
-};
-
-const toRelativeHref = (href: string | undefined, router: { href?: string }) => {
-  if (!href) {
-    return href;
-  }
-
   const origin = getOrigin(router?.href);
 
+  // Relative URL
   return origin ? href.replace(origin, '') || '/' : href;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.6.26",
+  "version": "0.6.27",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/ProjectSettings.ts

@@ -5,6 +5,7 @@ export interface ProjectSettings {
   FORCED_DRAFT_FLOW: boolean;
   ASSIST_PROJECT_ID?: string;
   SITEMAP?: string;
+  FOOTER?: string;
   CDN?: string; // Should ends with "/"
   YANDEX_MAP_API_KEY?: string;
   YANDEX_METRIKA_ID?: string;
@@ -38,6 +39,9 @@ export const projectSettings = new (class implements ProjectSettings {
   get SITEMAP() {
     return this._.SITEMAP;
   }
+  get FOOTER() {
+    return this._.FOOTER;
+  }
   get CDN() {
     return this._.CDN;
   }

package/src/components/Accordion/Accordion.fixture.mobile.tsx

@@ -1,6 +1,6 @@
 import { DEFAULT_SLOT_NAME } from '../../model/BlockDecorator';
 import type { BlockDef, ContentPageDef } from '../../model/ContentPageDef';
-import { context } from '../../react/setup-fixture';
+import '../../react/setup-fixture';
 import { AccordionItem } from '../AccordionItem/AccordionItem';
 import { Headline } from '../Headline/Headline';
 import { HEADLINE } from '../Headline/Headline.fixture';
@@ -13,13 +13,11 @@ import { Accordion } from './Accordion';
 
 const page = {} as ContentPageDef;
 
-const TEXT_BLOCK_ACCORDION_BLOCK = <TextBlock context={context} {...TEXT_BLOCK} />;
+const TEXT_BLOCK_ACCORDION_BLOCK = <TextBlock {...TEXT_BLOCK} />;
 
-const HEADLINE_ACCORDION_BLOCK = <Headline context={context} {...HEADLINE} />;
+const HEADLINE_ACCORDION_BLOCK = <Headline {...HEADLINE} />;
 
-const LINK_DOCS_ACCORDION_BLOCK = (
-  <LinkDocs context={context} {...linkDocsContentExample} title="" />
-);
+const LINK_DOCS_ACCORDION_BLOCK = <LinkDocs {...linkDocsContentExample} title="" />;
 
 const ACCORDION_BLOCK_DEF: BlockDef = {
   type: 'Accordion',
@@ -32,7 +30,6 @@ const ACCORDION_BLOCK_DEF: BlockDef = {
 
 export const ACCORDION_ITEM = (
   <AccordionItem
-    context={context}
     ancestors={[
       [page, DEFAULT_SLOT_NAME],
       [ACCORDION_BLOCK_DEF, DEFAULT_SLOT_NAME],
@@ -47,10 +44,9 @@ export const ACCORDION_ITEM = (
 export default {
   default: (
     <div className="container grid grid-cols-12">
-      <Accordion className="col-span-12" context={context} {...ACCORDION_BLOCK_DEF.content}>
+      <Accordion className="col-span-12" {...ACCORDION_BLOCK_DEF.content}>
         {ACCORDION_ITEM}
         <AccordionItem
-          context={context}
           ancestors={[
             [page, DEFAULT_SLOT_NAME],
             [ACCORDION_BLOCK_DEF, DEFAULT_SLOT_NAME],
@@ -60,7 +56,6 @@ export default {
           {[HEADLINE_ACCORDION_BLOCK]}
         </AccordionItem>
         <AccordionItem
-          context={context}
           ancestors={[
             [page, DEFAULT_SLOT_NAME],
             [ACCORDION_BLOCK_DEF, DEFAULT_SLOT_NAME],

package/src/components/Accordion/Accordion.fixture.tsx

@@ -1,4 +1,4 @@
-import { context } from '../../react/setup-fixture';
+import '../../react/setup-fixture';
 import { AccordionItem } from '../AccordionItem/AccordionItem';
 import { Gallery } from '../Gallery/Gallery';
 import { defaultProps as GALLERY } from '../Gallery/Gallery.fixture';
@@ -18,34 +18,26 @@ import { Tile } from '../Tile/Tile';
 import { TILE } from '../Tile/Tile.fixture';
 import { Accordion } from './Accordion';
 
-const TEXT_BLOCK_ACCORDION_BLOCK = (
-  <TextBlock className="col-span-12" context={context} {...TEXT_BLOCK} />
-);
+const TEXT_BLOCK_ACCORDION_BLOCK = <TextBlock className="col-span-12" {...TEXT_BLOCK} />;
 
-const HEADLINE_ACCORDION_BLOCK = (
-  <Headline className="col-span-12" context={context} {...HEADLINE} />
-);
+const HEADLINE_ACCORDION_BLOCK = <Headline className="col-span-12" {...HEADLINE} />;
 
-const PICTURE_TEXT_ACCORDION_BLOCK = (
-  <PictureText className="col-span-12" context={context} {...PICTURE_TEXT} />
-);
+const PICTURE_TEXT_ACCORDION_BLOCK = <PictureText className="col-span-12" {...PICTURE_TEXT} />;
 
 const LINK_DOCS_ACCORDION_BLOCK = (
-  <LinkDocs className="col-span-12" context={context} {...linkDocsContentExample} title="" />
+  <LinkDocs className="col-span-12" {...linkDocsContentExample} title="" />
 );
 
-const TILES_ACCORDION_BLOCK = <Tile className="col-span-6" context={context} {...TILE} />;
+const TILES_ACCORDION_BLOCK = <Tile className="col-span-6" {...TILE} />;
 
-const PRODUCT_TILES_ACCORDION_BLOCK = (
-  <ProductTile className="col-span-6" context={context} {...PRODUCT_TILE} />
-);
+const PRODUCT_TILES_ACCORDION_BLOCK = <ProductTile className="col-span-6" {...PRODUCT_TILE} />;
 
 const GALLERY_ACCORDION_BLOCK = <Gallery className="col-span-12" {...GALLERY} />;
 
 const MINI_GALLERY_ACCORDION_BLOCK = <MiniGallery className="col-span-12" {...MINI_GALLERY} />;
 
 export const ACCORDION_ITEM = (
-  <AccordionItem context={context} label="Accordion label 1">
+  <AccordionItem label="Accordion label 1">
     {[TEXT_BLOCK_ACCORDION_BLOCK, TEXT_BLOCK_ACCORDION_BLOCK]}
   </AccordionItem>
 );
@@ -55,32 +47,21 @@ export default {
     <div className="container grid grid-cols-12">
       <Accordion
         className="col-span-12"
-        context={context}
         title="Accordion title"
         description="Accordion description"
       >
         {ACCORDION_ITEM}
-        <AccordionItem context={context} label="Accordion label 2">
-          {[PICTURE_TEXT_ACCORDION_BLOCK]}
-        </AccordionItem>
-        <AccordionItem context={context} label="Accordion label 3">
-          {[HEADLINE_ACCORDION_BLOCK]}
-        </AccordionItem>
-        <AccordionItem context={context} label="Accordion label 4">
-          {[LINK_DOCS_ACCORDION_BLOCK]}
-        </AccordionItem>
-        <AccordionItem context={context} label="Accordion label 5">
+        <AccordionItem label="Accordion label 2">{[PICTURE_TEXT_ACCORDION_BLOCK]}</AccordionItem>
+        <AccordionItem label="Accordion label 3">{[HEADLINE_ACCORDION_BLOCK]}</AccordionItem>
+        <AccordionItem label="Accordion label 4">{[LINK_DOCS_ACCORDION_BLOCK]}</AccordionItem>
+        <AccordionItem label="Accordion label 5">
           {[TILES_ACCORDION_BLOCK, TILES_ACCORDION_BLOCK]}
         </AccordionItem>
-        <AccordionItem context={context} label="Accordion label 6">
+        <AccordionItem label="Accordion label 6">
           {[PRODUCT_TILES_ACCORDION_BLOCK, PRODUCT_TILES_ACCORDION_BLOCK]}
         </AccordionItem>
-        <AccordionItem context={context} label="Accordion label 7">
-          {[GALLERY_ACCORDION_BLOCK]}
-        </AccordionItem>
-        <AccordionItem context={context} label="Accordion label 8">
-          {[MINI_GALLERY_ACCORDION_BLOCK]}
-        </AccordionItem>
+        <AccordionItem label="Accordion label 7">{[GALLERY_ACCORDION_BLOCK]}</AccordionItem>
+        <AccordionItem label="Accordion label 8">{[MINI_GALLERY_ACCORDION_BLOCK]}</AccordionItem>
       </Accordion>
     </div>
   ),
@@ -88,17 +69,14 @@ export default {
     <div className="container grid grid-cols-12">
       <Accordion
         className="col-span-12"
-        context={context}
         title="Accordion title"
         accordionAlignTitle="right"
         description="Accordion description"
       >
-        <AccordionItem context={context} label="Accordion label 1">
+        <AccordionItem label="Accordion label 1">
           {[TEXT_BLOCK_ACCORDION_BLOCK, TEXT_BLOCK_ACCORDION_BLOCK]}
         </AccordionItem>
-        <AccordionItem context={context} label="Accordion label 2">
-          {[PICTURE_TEXT_ACCORDION_BLOCK]}
-        </AccordionItem>
+        <AccordionItem label="Accordion label 2">{[PICTURE_TEXT_ACCORDION_BLOCK]}</AccordionItem>
       </Accordion>
     </div>
   ),

package/src/components/Accordion/Accordion.mobile.tsx

@@ -8,9 +8,8 @@ import { AccordionItemsList } from './AccordionItemsList';
 export interface AccordionProps extends AccordionContent, UniBlockProps {}
 
 export const Accordion: JSXBlock<AccordionProps> = JSX<AccordionProps>(
-  ({ title, description, context, className = '', children, ...rest }) => (
+  ({ title, description, className = '', children, ...rest }) => (
     <BlockWrapper
-      context={context}
       className={`py-6 px-4 font-sans bg-white text-primary-text ${className}`}
       {...rest}
     >

package/src/components/Accordion/Accordion.tsx

@@ -9,17 +9,8 @@ import { AccordionItemsList } from './AccordionItemsList';
 export interface AccordionProps extends AccordionContent, UniBlockProps {}
 
 export const Accordion: JSXBlock<AccordionProps> = JSX<AccordionProps>(
-  ({
-    className = '',
-    context,
-    title,
-    accordionAlignTitle = 'center',
-    description,
-    children,
-    ...rest
-  }) => (
+  ({ className = '', title, accordionAlignTitle = 'center', description, children, ...rest }) => (
     <BlockWrapper
-      context={context}
       className={`p-[50px] mb-1 last:mb-0 font-sans bg-white text-primary-text ${className}`}
       {...rest}
     >

package/src/components/BaseTile/BaseTile.tsx

@@ -1,22 +1,21 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { UniBlockProps } from '../../model/JSXBlock';
 import type { BaseTileCommonProps } from './BaseTileProps';
 
-export interface BaseTileProps extends BaseTileCommonProps, UniBlockProps {}
+export interface BaseTileProps extends BaseTileCommonProps {
+  className?: string;
+}
 
 export const BaseTile = JSX<BaseTileProps>(
-  ({ className = '', title = '', children, buttons, image }) => {
-    return (
-      <div className={`font-sans flex flex-col grow h-full items-start ${className}`}>
-        {title}
-        <div className="flex grow w-full justify-between">
-          <div className="flex flex-col justify-between w-full">
-            <div className="h-full">{children}</div>
-            {buttons ? <div className="mt-auto pt-8">{buttons}</div> : null}
-          </div>
-          {image}
+  ({ className = '', title = '', buttons, image, children }) => (
+    <div className={`font-sans flex flex-col grow h-full items-start ${className}`}>
+      {title}
+      <div className="flex grow w-full justify-between">
+        <div className="flex flex-col justify-between w-full">
+          <div className="h-full">{children}</div>
+          {buttons ? <div className="mt-auto pt-8">{buttons}</div> : null}
         </div>
+        {image}
       </div>
-    );
-  },
+    </div>
+  ),
 );