@pisell/materials 6.7.4 → 6.8.2

package/es/components/PisellTabbar/components/TabbarLevel.js

@@ -0,0 +1,275 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import React, { memo } from 'react';
+import SuperTabs from "../../PisellSuperTabs";
+import PisellCards from "../../PisellCards";
+import Iconfont from "../../iconfont";
+import { DEFAULT_LEVEL_CONFIG, getExpandConfig } from "../constants";
+
+/**
+ * Tabbar 层级组件
+ * 负责渲染单个层级的 Tab 导航
+ */
+var TabbarLevel = /*#__PURE__*/memo(function (props) {
+  var skuId = props.skuId,
+    dataSource = props.dataSource,
+    activePanelKey = props.activePanelKey,
+    level = props.level,
+    setActivePanelKey = props.setActivePanelKey,
+    expand = props.expand,
+    handleExpand = props.handleExpand,
+    renderChildren = props.renderChildren,
+    customLevelConfig = props.levelConfig,
+    customExpandConfig = props.expandConfig;
+
+  // 合并配置
+  var levelConfig = _objectSpread(_objectSpread({}, DEFAULT_LEVEL_CONFIG[level]), customLevelConfig);
+  var expandConfig = customExpandConfig || getExpandConfig();
+
+  /**
+   * 渲染 level1 卡片
+   */
+  var renderLevel1Card = function renderLevel1Card(cardProps) {
+    var _cardProps$active;
+    var itemData = cardProps.dataSource;
+    var _text = itemData.name;
+    var _icon = itemData.icon;
+
+    // 处理展开按钮
+    if (itemData.key === 'expand') {
+      _text = expandConfig[expand ? 'active' : 'inactive'].text;
+      _icon = expandConfig[expand ? 'active' : 'inactive'].icon;
+    }
+    return /*#__PURE__*/React.createElement(PisellCards.GraphicTextCard, _extends({}, cardProps, {
+      text: _text,
+      icon: _icon,
+      variant: "vertical-image",
+      widthMode: "fixed",
+      width: levelConfig.cardWidth,
+      graphicConfig: {
+        width: '100%',
+        height: levelConfig.cardHeight,
+        background: '#fff',
+        iconSize: 30
+      },
+      style: {
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        background: '#fff',
+        borderRadius: 8,
+        border: "4px solid ".concat(levelConfig.superTabsBg)
+      },
+      textConfig: {
+        textAlign: 'center',
+        color: '#fff',
+        fontWeight: 400
+      },
+      active: {
+        value: true,
+        style: _objectSpread(_objectSpread({}, (_cardProps$active = cardProps.active) === null || _cardProps$active === void 0 ? void 0 : _cardProps$active.style), {}, {
+          color: '#5D3F9F'
+        })
+      }
+    }));
+  };
+
+  /**
+   * 渲染 level1 普通卡片（非自定义点击）
+   */
+  var renderLevel1NormalCard = function renderLevel1NormalCard(cardProps) {
+    var _cardProps$active2;
+    var itemData = cardProps.dataSource;
+    return /*#__PURE__*/React.createElement(PisellCards.GraphicTextCard, _extends({}, cardProps, {
+      text: itemData.name,
+      image: itemData.icon,
+      variant: "card",
+      widthMode: "fixed",
+      width: levelConfig.cardWidth,
+      textConfig: {
+        color: '#FFF'
+      },
+      active: _objectSpread(_objectSpread({}, cardProps.active), {}, {
+        style: _objectSpread(_objectSpread({}, (_cardProps$active2 = cardProps.active) === null || _cardProps$active2 === void 0 ? void 0 : _cardProps$active2.style), {}, {
+          color: '#000000'
+        })
+      }),
+      style: {
+        backgroundClip: 'padding-box'
+      },
+      graphicConfig: {
+        width: '100%',
+        height: "".concat(levelConfig.cardHeight, "px"),
+        dataSource: {
+          alt: itemData.icon ? undefined : itemData.name,
+          text: itemData.name === 'All' ? 'All' : undefined
+        }
+      }
+    }));
+  };
+
+  /**
+   * 渲染 level2/level3 自定义点击卡片
+   */
+  var renderLevelNCard = function renderLevelNCard(cardProps) {
+    var _cardProps$active3;
+    var itemData = cardProps.dataSource;
+    var _text = itemData.name;
+    var _icon = itemData.icon;
+    if (itemData.key === 'expand') {
+      _text = expandConfig[expand ? 'active' : 'inactive'].text;
+      _icon = expandConfig[expand ? 'active' : 'inactive'].icon;
+    }
+    return /*#__PURE__*/React.createElement(PisellCards.TextCard, _extends({}, cardProps, {
+      text: _text,
+      variant: "outlined",
+      widthMode: "fixed",
+      prefixIcon: itemData.key === 'expand' ? /*#__PURE__*/React.createElement(Iconfont, {
+        type: expandConfig[expand ? 'active' : 'inactive'].icon,
+        style: {
+          color: '#fff',
+          fontSize: 20
+        }
+      }) : undefined,
+      textConfig: {
+        textAlign: 'center',
+        color: '#FFF',
+        flex: 'none'
+      },
+      style: {
+        borderRadius: '8px',
+        background: 'rgba(0, 0, 0, 0.50)',
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center',
+        height: levelConfig.cardHeight
+      },
+      width: levelConfig.cardWidth,
+      active: _objectSpread(_objectSpread({}, cardProps.active), {}, {
+        style: _objectSpread(_objectSpread({}, (_cardProps$active3 = cardProps.active) === null || _cardProps$active3 === void 0 ? void 0 : _cardProps$active3.style), {}, {
+          color: '#000000',
+          background: '#ffffff'
+        })
+      })
+    }));
+  };
+
+  /**
+   * 渲染 level2/level3 普通卡片
+   */
+  var renderLevelNNormalCard = function renderLevelNNormalCard(cardProps) {
+    var _cardProps$active4;
+    var itemData = cardProps.dataSource;
+    return /*#__PURE__*/React.createElement(PisellCards.TextCard, _extends({}, cardProps, {
+      text: itemData.name,
+      variant: "outlined",
+      widthMode: "fixed",
+      textConfig: {
+        textAlign: 'center',
+        color: '#FFF',
+        maxLines: 2,
+        ellipsis: true
+      },
+      style: {
+        height: levelConfig.cardHeight,
+        borderRadius: '8px',
+        background: 'rgba(0, 0, 0, 0.50)'
+      },
+      width: levelConfig.cardWidth,
+      active: _objectSpread(_objectSpread({}, cardProps.active), {}, {
+        style: _objectSpread(_objectSpread({}, (_cardProps$active4 = cardProps.active) === null || _cardProps$active4 === void 0 ? void 0 : _cardProps$active4.style), {}, {
+          color: '#000000',
+          background: '#ffffff'
+        })
+      })
+    }));
+  };
+
+  /**
+   * 渲染 Tab 项
+   */
+  var renderItem = function renderItem(itemProps) {
+    var itemData = itemProps.dataSource;
+
+    // 处理自定义点击事件的项（如展开按钮）
+    if (itemData !== null && itemData !== void 0 && itemData.customClick) {
+      return /*#__PURE__*/React.createElement(PisellCards.MultilevelCard, _extends({}, itemProps, {
+        card: function card(cardProps) {
+          if (level === 'level1') {
+            return renderLevel1Card(cardProps);
+          }
+          return renderLevelNCard(cardProps);
+        },
+        onClick: handleExpand
+      }));
+    }
+
+    // 普通项
+    return /*#__PURE__*/React.createElement(PisellCards.MultilevelCard, _extends({}, itemProps, {
+      card: function card(cardProps) {
+        if (level === 'level1') {
+          return renderLevel1NormalCard(cardProps);
+        }
+        return renderLevelNNormalCard(cardProps);
+      },
+      panel: function panel(panelProps) {
+        var _panelProps$dataSourc;
+        if (panelProps !== null && panelProps !== void 0 && (_panelProps$dataSourc = panelProps.dataSource) !== null && _panelProps$dataSourc !== void 0 && (_panelProps$dataSourc = _panelProps$dataSourc.children) !== null && _panelProps$dataSourc !== void 0 && _panelProps$dataSourc.length) {
+          return renderChildren === null || renderChildren === void 0 ? void 0 : renderChildren(panelProps);
+        }
+        return null;
+      },
+      panelContainer: function panelContainer() {
+        return document.querySelector(".pisell-super-tabs-slot-bottom-".concat(skuId));
+      }
+    }));
+  };
+  return /*#__PURE__*/React.createElement(SuperTabs, {
+    id: skuId,
+    tabItemStyle: {},
+    dataSource: dataSource,
+    value: activePanelKey,
+    onChange: setActivePanelKey,
+    rowKey: "id",
+    style: {
+      flex: 1,
+      background: levelConfig.superTabsBg
+    },
+    gridProps: {
+      direction: 'horizontal',
+      gap: 4,
+      wrap: expand ? 'wrap' : 'nowrap',
+      startSlot: level === 'level1' ? null : /*#__PURE__*/React.createElement("div", {
+        style: {
+          paddingLeft: levelConfig.paddingLeft
+        }
+      }, /*#__PURE__*/React.createElement(Iconfont, {
+        type: "pisell2-trend-down-01",
+        style: {
+          color: '#fff',
+          fontSize: 24,
+          marginRight: 8
+        }
+      }))
+    },
+    scrollViewProps: {
+      style: {
+        padding: '4px 8px'
+      },
+      overflow: !expand ? 'x' : 'hidden',
+      scrollbarStyle: 'none',
+      scrollActionsConfig: {
+        type: 'lrArrows',
+        show: true
+      }
+    },
+    renderItem: renderItem
+  });
+});
+TabbarLevel.displayName = 'TabbarLevel';
+export default TabbarLevel;

package/es/components/PisellTabbar/components/index.d.ts

@@ -0,0 +1 @@
+export { default as TabbarLevel } from './TabbarLevel';

package/es/components/PisellTabbar/components/index.js

@@ -0,0 +1,2 @@
+// 子组件
+export { default as TabbarLevel } from "./TabbarLevel";

package/es/components/PisellTabbar/constants.d.ts

@@ -0,0 +1,46 @@
+import { TabbarLevelConfig, ExpandConfig, LevelType } from './types';
+/**
+ * 默认层级配置
+ */
+export declare const DEFAULT_LEVEL_CONFIG: Record<LevelType, TabbarLevelConfig>;
+/**
+ * 获取展开配置
+ */
+export declare const getExpandConfig: () => ExpandConfig;
+/**
+ * 默认数据项配置
+ */
+export declare const DEFAULT_ITEMS: {
+    all: {
+        id: number;
+        shop_id: number;
+        parent_id: number;
+        name: string;
+        slug: string;
+        icon: string;
+    };
+    search: {
+        id: number;
+        shop_id: number;
+        parent_id: number;
+        name: string;
+        slug: string;
+        key: string;
+        icon: string;
+        customClick: boolean;
+    };
+    expand: {
+        id: number;
+        shop_id: number;
+        parent_id: number;
+        key: string;
+        icon: string;
+        name: string;
+        slug: string;
+        customClick: boolean;
+    };
+};
+/**
+ * 获取层级对应的添加项配置
+ */
+export declare const LEVEL_ADD_ITEMS: Record<LevelType, ('all' | 'search' | 'expand')[]>;

package/es/components/PisellTabbar/constants.js

@@ -0,0 +1,84 @@
+import { getText } from "../../locales";
+
+/**
+ * 默认层级配置
+ */
+export var DEFAULT_LEVEL_CONFIG = {
+  level1: {
+    superTabsBg: '#3b2865',
+    cardWidth: 100,
+    cardHeight: 60,
+    paddingLeft: 0
+  },
+  level2: {
+    superTabsBg: '#7F56DA',
+    cardWidth: 120,
+    cardHeight: 56,
+    paddingLeft: 20
+  },
+  level3: {
+    superTabsBg: '#344054',
+    cardWidth: 120,
+    cardHeight: 56,
+    paddingLeft: 40
+  }
+};
+
+/**
+ * 获取展开配置
+ */
+export var getExpandConfig = function getExpandConfig() {
+  return {
+    active: {
+      icon: 'pisell2-minimize-01',
+      text: getText('pisell-tabbar-minimize')
+    },
+    inactive: {
+      icon: 'pisell2-expand-01',
+      text: getText('pisell-tabbar-expand')
+    }
+  };
+};
+
+/**
+ * 默认数据项配置
+ */
+export var DEFAULT_ITEMS = {
+  all: {
+    id: 0,
+    shop_id: 9,
+    parent_id: 0,
+    name: 'All',
+    slug: 'All',
+    icon: ''
+  },
+  search: {
+    id: -1,
+    shop_id: 9,
+    parent_id: 0,
+    name: 'Search',
+    slug: 'Search',
+    key: 'search',
+    icon: '',
+    customClick: true
+  },
+  expand: {
+    id: -2,
+    shop_id: 9,
+    parent_id: 0,
+    key: 'expand',
+    icon: 'pisell2-expand-01',
+    name: 'Expand',
+    slug: 'expand',
+    customClick: true
+  }
+};
+
+/**
+ * 获取层级对应的添加项配置
+ */
+export var LEVEL_ADD_ITEMS = {
+  level1: ['expand'],
+  level2: ['expand', 'all'],
+  level3: ['expand', 'all']
+};

package/es/components/PisellTabbar/hooks/index.d.ts

@@ -0,0 +1,2 @@
+export { default as useActiveKey } from './useActiveKey';
+export { default as useExpand } from './useExpand';

package/es/components/PisellTabbar/hooks/index.js

@@ -0,0 +1,3 @@
+// 自定义 hooks
+export { default as useActiveKey } from "./useActiveKey";
+export { default as useExpand } from "./useExpand";

package/es/components/PisellTabbar/hooks/useActiveKey.d.ts

@@ -0,0 +1,49 @@
+/**
+ * useActiveKey Hook 参数
+ */
+interface UseActiveKeyProps {
+    /** 初始激活的 key 数组（对应多层级） */
+    initialActiveKey?: (string | number)[];
+    /** key 变化回调 */
+    onChange?: (value: (string | number)[]) => void;
+}
+/**
+ * useActiveKey Hook 返回值
+ */
+interface UseActiveKeyReturn {
+    /** 当前激活的 key 数组 */
+    activeKey: (string | number)[];
+    /** 设置指定层级的激活 key */
+    setActiveKey: (level: number, key: string | number, cKey?: string | number) => void;
+    /** 获取指定层级的激活 key */
+    getActiveKey: (level: number) => string | number;
+    /** 内部设置方法（用于同步外部值） */
+    _setActiveKey: (value: (string | number)[]) => void;
+}
+/**
+ * Tabbar 激活状态管理 Hook
+ *
+ * 用于管理多层级 Tabbar 的激活状态，支持级联选择
+ *
+ * @param props - Hook 配置参数
+ * @returns 激活状态和操作方法
+ *
+ * @example
+ * ```tsx
+ * const { activeKey, setActiveKey, getActiveKey } = useActiveKey({
+ *   initialActiveKey: [1, 10],
+ *   onChange: (value) => console.log('当前选中:', value)
+ * });
+ *
+ * // 设置第 0 层级的 key，并清除后续层级
+ * setActiveKey(0, '2');
+ *
+ * // 设置第 0 层级的 key，并同时设置第 1 层级
+ * setActiveKey(0, '2', '20');
+ *
+ * // 获取第 0 层级的 key
+ * const level0Key = getActiveKey(0);
+ * ```
+ */
+declare const useActiveKey: (props: UseActiveKeyProps) => UseActiveKeyReturn;
+export default useActiveKey;

package/es/components/PisellTabbar/hooks/useActiveKey.js

@@ -0,0 +1,104 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { useState } from 'react';
+
+/**
+ * useActiveKey Hook 参数
+ */
+
+/**
+ * useActiveKey Hook 返回值
+ */
+
+/**
+ * Tabbar 激活状态管理 Hook
+ * 
+ * 用于管理多层级 Tabbar 的激活状态，支持级联选择
+ * 
+ * @param props - Hook 配置参数
+ * @returns 激活状态和操作方法
+ * 
+ * @example
+ * ```tsx
+ * const { activeKey, setActiveKey, getActiveKey } = useActiveKey({
+ *   initialActiveKey: [1, 10],
+ *   onChange: (value) => console.log('当前选中:', value)
+ * });
+ * 
+ * // 设置第 0 层级的 key，并清除后续层级
+ * setActiveKey(0, '2');
+ * 
+ * // 设置第 0 层级的 key，并同时设置第 1 层级
+ * setActiveKey(0, '2', '20');
+ * 
+ * // 获取第 0 层级的 key
+ * const level0Key = getActiveKey(0);
+ * ```
+ */
+var useActiveKey = function useActiveKey(props) {
+  var _props$initialActiveK = props.initialActiveKey,
+    initialActiveKey = _props$initialActiveK === void 0 ? [] : _props$initialActiveK,
+    onChange = props.onChange;
+  var _useState = useState(initialActiveKey),
+    _useState2 = _slicedToArray(_useState, 2),
+    activeKey = _useState2[0],
+    _setActiveKey2 = _useState2[1];
+
+  /**
+   * 设置指定层级的激活 key
+   * 
+   * @param level - 层级索引（0-based）
+   * @param key - 要设置的 key 值
+   * @param cKey - 可选的子级 key（如果有子级需要同时激活）
+   * 
+   * @description
+   * 设置时会自动清除该层级之后的所有层级 key，保证层级逻辑的一致性
+   */
+  var setActiveKey = function setActiveKey(level, key, cKey) {
+    var newActiveKey = _toConsumableArray(activeKey);
+    // 删除该层级之后的所有层级
+    newActiveKey.splice(level + 1);
+    // 设置当前层级
+    newActiveKey[level] = String(key);
+
+    // 如果提供了子级 key，同时设置
+    if (cKey !== undefined) {
+      newActiveKey[level + 1] = String(cKey);
+    }
+    _setActiveKey2(newActiveKey);
+    onChange === null || onChange === void 0 || onChange(newActiveKey);
+  };
+
+  /**
+   * 获取指定层级的激活 key
+   * 
+   * @param level - 层级索引（0-based）
+   * @returns 该层级的激活 key
+   */
+  var getActiveKey = function getActiveKey(level) {
+    return activeKey[level];
+  };
+  return {
+    activeKey: activeKey,
+    setActiveKey: setActiveKey,
+    getActiveKey: getActiveKey,
+    /**
+     * 内部设置方法，用于同步外部传入的 value
+     * 会进行深比较，避免不必要的更新
+     */
+    _setActiveKey: function _setActiveKey(value) {
+      if (JSON.stringify(value) !== JSON.stringify(activeKey)) {
+        _setActiveKey2(value || initialActiveKey);
+      }
+    }
+  };
+};
+export default useActiveKey;

package/es/components/PisellTabbar/hooks/useExpand.d.ts

@@ -0,0 +1,41 @@
+import { ExpandState, LevelType } from '../types';
+/**
+ * useExpand Hook 参数
+ */
+interface UseExpandProps {
+    /** 初始展开状态 */
+    initialExpand?: Partial<ExpandState>;
+}
+/**
+ * useExpand Hook 返回值
+ */
+interface UseExpandReturn {
+    /** 展开状态 */
+    expand: ExpandState;
+    /** 设置展开状态 */
+    setExpand: (state: ExpandState) => void;
+    /** 切换指定层级的展开状态 */
+    toggleExpand: (level: LevelType) => void;
+    /** 获取指定层级的展开状态 */
+    getExpand: (level: LevelType) => boolean;
+}
+/**
+ * Tabbar 展开状态管理 Hook
+ * 用于管理多层级的展开/收起状态
+ *
+ * @param props - Hook 配置参数
+ * @returns 展开状态和操作方法
+ *
+ * @example
+ * ```tsx
+ * const { expand, toggleExpand, getExpand } = useExpand({
+ *   initialExpand: { level1: false }
+ * });
+ *
+ * <button onClick={() => toggleExpand('level1')}>
+ *   {getExpand('level1') ? '收起' : '展开'}
+ * </button>
+ * ```
+ */
+declare const useExpand: (props?: UseExpandProps) => UseExpandReturn;
+export default useExpand;