@alifd/chat 0.3.37-beta.0 → 0.3.37-beta.10

package/lib/html-render/index.js

@@ -20,8 +20,6 @@ const copy_to_clipboard_1 = tslib_1.__importDefault(require("copy-to-clipboard")
 const next_2 = require("@alifd/next");
 const balloon_1 = tslib_1.__importDefault(require("../balloon"));
 require("../balloon/style");
-const IMAGE_MAX_HEIGHT = 222;
-const IMAGE_MAX_WIDTH = 372;
 const sanitizeHtmlOptions = {
     allowedTags: sanitize_html_1.default.defaults.allowedTags.concat([
         'acronym', 'audio', 'big', 'center', 'del', 'dir', 'font',
@@ -199,7 +197,7 @@ const HTMLRenderer = (0, react_1.memo)(function HTMLRenderer({ className, childr
         indexRef.current = 0;
         return (0, html_react_parser_1.default)((0, sanitize_html_1.default)(children || '', sanitizeHtmlOptions), parserOptions);
     }, [children, typewriterEffect]);
-    return (react_1.default.createElement("div", { className: (0, classnames_1.default)(`${utils_1.PREFIX_DEFAULT}html`, className, {
+    return (react_1.default.createElement("div", { className: (0, classnames_1.default)(`markdown-body ${utils_1.PREFIX_DEFAULT}html`, className, {
             'loose': loose,
         }) }, imagePreview ?
         react_1.default.createElement(react_photo_view_1.PhotoProvider, null, element)

package/lib/html-render/main.scss

@@ -1,4 +1,6 @@
 @import "../core/variables.scss";
+// @import "./github-markdown-css.css";
+// @import "github-markdown-css/github-markdown-light.css";
 
 .#{$prefix}html {
   font-size: 14px;
@@ -27,6 +29,7 @@
     }
   }
 
+
   img {
     body.global-dark & {
       background: $color-bg-1;
@@ -57,6 +60,7 @@
   h1 {
     font-size: 18px;
     line-height: 1.8;
+    margin: 0.5rem 0;
 
     &.loose {
       font-size: 28px;
@@ -66,6 +70,7 @@
   h2 {
     font-size: 16px;
     line-height: 1.8;
+    margin: 0.5rem 0;
 
     &.loose {
       font-size: 24px;
@@ -74,7 +79,7 @@
 
   h3, h4, h5, h6 {
     font-size: 14px;
-    line-height: 1.9;
+    line-height: 2;
   }
 
   h3 {
@@ -202,6 +207,21 @@
 
   li {
     list-style: revert;
+    line-height: 1.8;
+  }
+
+  li>p {
+    margin: 0.3rem 0;
+  }
+
+  p {
+    margin: 0.3rem 0;
+    line-height: 1.8;
+  }
+
+  span {
+    line-height: 1.8;
+    margin: 0.3rem 0;
   }
 
   blockquote {

package/lib/html-render/utils.d.ts

@@ -0,0 +1,2 @@
+export declare const isDingTalk: boolean;
+export declare const isMobile: boolean;

package/lib/html-render/utils.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isMobile = exports.isDingTalk = void 0;
+exports.isDingTalk = !!navigator.userAgent.match(/DingTalk/i);
+exports.isMobile = /HarmonyOS|ArkWeb|Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator === null || navigator === void 0 ? void 0 : navigator.userAgent);

package/lib/icon/icon.css

@@ -0,0 +1,363 @@
+.next-sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  white-space: nowrap;
+  border: 0;
+  top: 0;
+  margin: -1px;
+}
+
+.next-icon[dir=rtl]::before {
+  transform: rotateY(180deg);
+}
+
+@font-face {
+  font-family: ChatNextIcon;
+  src: url("//at.alicdn.com/t/font_515771_xjdbujl2iu.eot");
+  src: url("//at.alicdn.com/t/font_515771_xjdbujl2iu.eot?#iefix") format("embedded-opentype"), url("//at.alicdn.com/t/font_515771_xjdbujl2iu.woff2") format("woff2"), url("//at.alicdn.com/t/font_515771_xjdbujl2iu.woff") format("woff"), url("//at.alicdn.com/t/font_515771_xjdbujl2iu.ttf") format("truetype"), url("//at.alicdn.com/t/font_515771_xjdbujl2iu.svg#NextIcon") format("svg");
+  font-display: swap;
+}
+
+.ct-icon {
+  font-family: ChatNextIcon !important;
+}
+
+.next-icon {
+  display: inline-block;
+  font-family: NextIcon;
+  font-style: normal;
+  font-weight: normal;
+  text-transform: none;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.next-icon:before {
+  display: inline-block;
+  vertical-align: middle;
+  text-align: center;
+}
+.next-icon-smile:before {
+  content: "\e65f";
+  content: var(--icon-content-smile, "\e65f");
+}
+.next-icon-cry:before {
+  content: "\e65d";
+  content: var(--icon-content-cry, "\e65d");
+}
+.next-icon-success:before {
+  content: "\e60a";
+  content: var(--icon-content-success, "\e60a");
+}
+.next-icon-warning:before {
+  content: "\e60b";
+  content: var(--icon-content-warning, "\e60b");
+}
+.next-icon-prompt:before {
+  content: "\e60c";
+  content: var(--icon-content-prompt, "\e60c");
+}
+.next-icon-error:before {
+  content: "\e60d";
+  content: var(--icon-content-error, "\e60d");
+}
+.next-icon-help:before {
+  content: "\e673";
+  content: var(--icon-content-help, "\e673");
+}
+.next-icon-clock:before {
+  content: "\e621";
+  content: var(--icon-content-clock, "\e621");
+}
+.next-icon-success-filling:before {
+  content: "\e63a";
+  content: var(--icon-content-success-filling, "\e63a");
+}
+.next-icon-delete-filling:before {
+  content: "\e623";
+  content: var(--icon-content-delete-filling, "\e623");
+}
+.next-icon-favorites-filling:before {
+  content: "\e60e";
+  content: var(--icon-content-favorites-filling, "\e60e");
+}
+.next-icon-add:before {
+  content: "\e655";
+  content: var(--icon-content-add, "\e655");
+}
+.next-icon-minus:before {
+  content: "\e601";
+  content: var(--icon-content-minus, "\e601");
+}
+.next-icon-arrow-up:before {
+  content: "\e625";
+  content: var(--icon-content-arrow-up, "\e625");
+}
+.next-icon-arrow-down:before {
+  content: "\e63d";
+  content: var(--icon-content-arrow-down, "\e63d");
+}
+.next-icon-arrow-left:before {
+  content: "\e61d";
+  content: var(--icon-content-arrow-left, "\e61d");
+}
+.next-icon-arrow-right:before {
+  content: "\e619";
+  content: var(--icon-content-arrow-right, "\e619");
+}
+.next-icon-arrow-double-left:before {
+  content: "\e659";
+  content: var(--icon-content-arrow-double-left, "\e659");
+}
+.next-icon-arrow-double-right:before {
+  content: "\e65e";
+  content: var(--icon-content-arrow-double-right, "\e65e");
+}
+.next-icon-switch:before {
+  content: "\e6b3";
+  content: var(--icon-content-switch, "\e6b3");
+}
+.next-icon-sorting:before {
+  content: "\e634";
+  content: var(--icon-content-sorting, "\e634");
+}
+.next-icon-descending:before {
+  content: "\e61f";
+  content: var(--icon-content-descending, "\e61f");
+}
+.next-icon-ascending:before {
+  content: "\e61e";
+  content: var(--icon-content-ascending, "\e61e");
+}
+.next-icon-select:before {
+  content: "\e632";
+  content: var(--icon-content-select, "\e632");
+}
+.next-icon-semi-select:before {
+  content: "\e633";
+  content: var(--icon-content-semi-select, "\e633");
+}
+.next-icon-search:before {
+  content: "\e656";
+  content: var(--icon-content-search, "\e656");
+}
+.next-icon-close:before {
+  content: "\e626";
+  content: var(--icon-content-close, "\e626");
+}
+.next-icon-ellipsis:before {
+  content: "\e654";
+  content: var(--icon-content-ellipsis, "\e654");
+}
+.next-icon-picture:before {
+  content: "\e631";
+  content: var(--icon-content-picture, "\e631");
+}
+.next-icon-calendar:before {
+  content: "\e607";
+  content: var(--icon-content-calendar, "\e607");
+}
+.next-icon-ashbin:before {
+  content: "\e639";
+  content: var(--icon-content-ashbin, "\e639");
+}
+.next-icon-upload:before {
+  content: "\e7ee";
+  content: var(--icon-content-upload, "\e7ee");
+}
+.next-icon-download:before {
+  content: "\e628";
+  content: var(--icon-content-download, "\e628");
+}
+.next-icon-set:before {
+  content: "\e683";
+  content: var(--icon-content-set, "\e683");
+}
+.next-icon-edit:before {
+  content: "\e63b";
+  content: var(--icon-content-edit, "\e63b");
+}
+.next-icon-refresh:before {
+  content: "\e677";
+  content: var(--icon-content-refresh, "\e677");
+}
+.next-icon-filter:before {
+  content: "\e627";
+  content: var(--icon-content-filter, "\e627");
+}
+.next-icon-attachment:before {
+  content: "\e665";
+  content: var(--icon-content-attachment, "\e665");
+}
+.next-icon-account:before {
+  content: "\e608";
+  content: var(--icon-content-account, "\e608");
+}
+.next-icon-email:before {
+  content: "\e605";
+  content: var(--icon-content-email, "\e605");
+}
+.next-icon-atm:before {
+  content: "\e606";
+  content: var(--icon-content-atm, "\e606");
+}
+.next-icon-loading:before {
+  content: "\e646";
+  content: var(--icon-content-loading, "\e646");
+  animation: loadingCircle 1s infinite linear;
+}
+.next-icon-eye:before {
+  content: "\e611";
+  content: var(--icon-content-eye, "\e611");
+}
+.next-icon-copy:before {
+  content: "\e60f";
+  content: var(--icon-content-copy, "\e60f");
+}
+.next-icon-toggle-left:before {
+  content: "\e602";
+  content: var(--icon-content-toggle-left, "\e602");
+}
+.next-icon-toggle-right:before {
+  content: "\e603";
+  content: var(--icon-content-toggle-right, "\e603");
+}
+.next-icon-eye-close:before {
+  content: "\e600";
+  content: var(--icon-content-eye-close, "\e600");
+}
+.next-icon-unlock:before {
+  content: "\e615";
+  content: var(--icon-content-unlock, "\e615");
+}
+.next-icon-lock:before {
+  content: "\e617";
+  content: var(--icon-content-lock, "\e617");
+}
+.next-icon-exit:before {
+  content: "\e616";
+  content: var(--icon-content-exit, "\e616");
+}
+.next-icon-chart-bar:before {
+  content: "\e612";
+  content: var(--icon-content-chart-bar, "\e612");
+}
+.next-icon-chart-pie:before {
+  content: "\e613";
+  content: var(--icon-content-chart-pie, "\e613");
+}
+.next-icon-form:before {
+  content: "\e7fb";
+  content: var(--icon-content-form, "\e7fb");
+}
+.next-icon-detail:before {
+  content: "\e7f8";
+  content: var(--icon-content-detail, "\e7f8");
+}
+.next-icon-list:before {
+  content: "\e7f9";
+  content: var(--icon-content-list, "\e7f9");
+}
+.next-icon-dashboard:before {
+  content: "\e7fa";
+  content: var(--icon-content-dashboard, "\e7fa");
+}
+
+@keyframes loadingCircle {
+  0% {
+    transform-origin: 50% 50%;
+    transform: rotate(0deg);
+  }
+  100% {
+    transform-origin: 50% 50%;
+    transform: rotate(360deg);
+  }
+}
+.next-icon.next-xxs:before, .next-icon.next-xxs .next-icon-remote {
+  width: 8px;
+  width: var(--icon-xxs, 8px);
+  font-size: 8px;
+  font-size: var(--icon-xxs, 8px);
+  line-height: inherit;
+}
+@media all and (-webkit-min-device-pixel-ratio: 0) and (min-resolution: 0.001dpcm) {
+  .next-icon.next-xxs {
+    transform: scale(0.5);
+    margin-left: -4px;
+    margin-left: calc(0px - var(--icon-s, 16px)/2 + var(--icon-xxs, 8px)/2);
+    margin-right: -4px;
+    margin-right: calc(0px - var(--icon-s, 16px)/2 + var(--icon-xxs, 8px)/2);
+  }
+  .next-icon.next-xxs:before {
+    width: 16px;
+    width: var(--icon-s, 16px);
+    font-size: 16px;
+    font-size: var(--icon-s, 16px);
+  }
+}
+.next-icon.next-xs:before, .next-icon.next-xs .next-icon-remote {
+  width: 12px;
+  width: var(--icon-xs, 12px);
+  font-size: 12px;
+  font-size: var(--icon-xs, 12px);
+  line-height: inherit;
+}
+.next-icon.next-small:before, .next-icon.next-small .next-icon-remote {
+  width: 16px;
+  width: var(--icon-s, 16px);
+  font-size: 16px;
+  font-size: var(--icon-s, 16px);
+  line-height: inherit;
+}
+.next-icon.next-medium:before, .next-icon.next-medium .next-icon-remote {
+  width: 20px;
+  width: var(--icon-m, 20px);
+  font-size: 20px;
+  font-size: var(--icon-m, 20px);
+  line-height: inherit;
+}
+.next-icon.next-large:before, .next-icon.next-large .next-icon-remote {
+  width: 24px;
+  width: var(--icon-l, 24px);
+  font-size: 24px;
+  font-size: var(--icon-l, 24px);
+  line-height: inherit;
+}
+.next-icon.next-xl:before, .next-icon.next-xl .next-icon-remote {
+  width: 32px;
+  width: var(--icon-xl, 32px);
+  font-size: 32px;
+  font-size: var(--icon-xl, 32px);
+  line-height: inherit;
+}
+.next-icon.next-xxl:before, .next-icon.next-xxl .next-icon-remote {
+  width: 48px;
+  width: var(--icon-xxl, 48px);
+  font-size: 48px;
+  font-size: var(--icon-xxl, 48px);
+  line-height: inherit;
+}
+.next-icon.next-xxxl:before, .next-icon.next-xxxl .next-icon-remote {
+  width: 64px;
+  width: var(--icon-xxxl, 64px);
+  font-size: 64px;
+  font-size: var(--icon-xxxl, 64px);
+  line-height: inherit;
+}
+.next-icon.next-inherit:before, .next-icon.next-inherit .next-icon-remote {
+  width: inherit;
+  font-size: inherit;
+  line-height: inherit;
+}
+
+.next-icon.next-inherit .next-icon-remote,
+.next-icon .next-icon-remote {
+  width: 1em;
+  height: 1em;
+  vertical-align: middle;
+  fill: currentColor;
+}

package/lib/index.js

@@ -70,4 +70,4 @@ var flip_1 = require("./flip");
 Object.defineProperty(exports, "Flip", { enumerable: true, get: function () { return tslib_1.__importDefault(flip_1).default; } });
 var tool_status_1 = require("./tool-status");
 Object.defineProperty(exports, "ToolStatus", { enumerable: true, get: function () { return tslib_1.__importDefault(tool_status_1).default; } });
-exports.version = '0.3.37-beta.0';
+exports.version = '0.3.37-beta.10';

package/lib/markdown/index.js

@@ -22,7 +22,7 @@ const DEFAULT_WHITELIST_TAGS = ['img', 'code', 'pre', 'link-reference'];
  * @when 需要解析和渲染 Markdown 文本内容时使用。 - Use when you need to parse and render Markdown text content.
  */
 const Markdown = (0, react_1.forwardRef)((_a, ref) => {
-    var { className, onReady, content } = _a, others = tslib_1.__rest(_a, ["className", "onReady", "content"]);
+    var { className, onReady, content, needCodeHeader = true } = _a, others = tslib_1.__rest(_a, ["className", "onReady", "content", "needCodeHeader"]);
     (0, react_1.useEffect)(() => {
         // 初始化表情库
         (0, dingtalk_im_emoji_1.init)();
@@ -228,6 +228,9 @@ const Markdown = (0, react_1.forwardRef)((_a, ref) => {
         return md.render(transformedContent);
     }, [transformedContent]);
     (0, react_1.useEffect)(() => {
+        if (!needCodeHeader) {
+            return;
+        }
         if (containerRef.current) {
             // 清除现有的 .code-block-header 元素
             const existingHeaders = containerRef.current.querySelectorAll('.code-block-header');

package/lib/markdown/types.d.ts

@@ -76,4 +76,9 @@ export interface MarkdownProps extends React.HTMLAttributes<HTMLElement> {
      * @en Whitelist tags that will be put into typewriter queue as a whole
      */
     whitelistTags?: string[];
+    /**
+     * 是不是需要头部的代码复制区域
+     * @en Tags that will not be put into typewriter queue
+     */
+    needCodeHeader?: boolean;
 }

package/lib/reference/index.js

@@ -77,7 +77,10 @@ const Reference = (0, react_1.forwardRef)(({ className, defaultExpanded = false,
     };
     const handleReferenceClick = (item, index, event) => {
         event.stopPropagation();
-        onItemClick === null || onItemClick === void 0 ? void 0 : onItemClick(item, index);
+        if (onItemClick) {
+            onItemClick === null || onItemClick === void 0 ? void 0 : onItemClick(item, index);
+            return;
+        }
         (item === null || item === void 0 ? void 0 : item.url) && window.open(item === null || item === void 0 ? void 0 : item.url, '_blank');
     };
     const renderDetailList = () => {

package/lib/tool-status/index.js

@@ -16,7 +16,7 @@ const SUCCESS_ICON = 'icon-check'; //'success'
 const ERROR_ICON = 'icon-cross1'; //'error'
 const LOADING_ICON = 'loading';
 const ToolStatus = (0, react_1.forwardRef)((props, ref) => {
-    const { useText = '使用', name, className, selected = false, status, onToolClick, authInfo, fullWidth } = props;
+    const { useText = '使用', name, className, selected = false, status, onToolClick, authInfo, fullWidth, param, groupName } = props;
     const handleClick = (event) => {
         event.stopPropagation();
         onToolClick === null || onToolClick === void 0 ? void 0 : onToolClick(props);
@@ -33,8 +33,11 @@ const ToolStatus = (0, react_1.forwardRef)((props, ref) => {
                 event.stopPropagation();
                 (_a = authInfo === null || authInfo === void 0 ? void 0 : authInfo.onAuthClick) === null || _a === void 0 ? void 0 : _a.call(authInfo, props);
             } }, authInfo === null || authInfo === void 0 ? void 0 : authInfo.content),
-        react_1.default.createElement("div", { className: 'content-use-tips' }, useText),
-        react_1.default.createElement("div", { className: 'content-name' }, name)));
+        react_1.default.createElement("div", { className: 'content-container' },
+            react_1.default.createElement("div", { className: 'content-use-tips' }, useText),
+            groupName && react_1.default.createElement("div", { className: 'content-group' }, groupName),
+            name && react_1.default.createElement("div", { className: 'content-name' }, name),
+            param && react_1.default.createElement("div", { className: 'content-detail' }, param))));
 });
 tslib_1.__exportStar(require("./types"), exports);
 exports.default = next_1.ConfigProvider.config(ToolStatus);

package/lib/tool-status/main.scss

@@ -54,22 +54,31 @@
     line-height: $s-4;
     font-size: $font-size-caption;
     cursor: pointer;
-    margin-right: $s-1;
+    min-width: 52px;
   }
 
-  .content-use-tips {
-    color: $color-text1-3;
-    margin-right: $s-1;
-    line-height: $s-4;
+  .content-container {
+    flex: 1;
+    display: flex;
+    overflow: hidden;
   }
 
-  .content-name {
-    color: $color-text1-4;
+  .content-use-tips, .content-group, .content-name, .content-detail {
+    color: $color-text1-3;
     line-height: $s-4;
+    margin-right: $s-1;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
-    flex: 1;
   }
 
+
+  .content-group {
+    color: $color-text1-4;
+  }
+
+  .content-detail {
+    flex: 1;
+    color: $color-text1-4;
+  }
 }

package/lib/tool-status/types.d.ts

@@ -33,10 +33,18 @@ export interface ToolStatusProps extends React.HTMLAttributes<HTMLElement>, Comm
      * 工具名称
      */
     name?: string;
+    /**
+     * 工具集名称
+     */
+    groupName?: string;
     /**
      * 工具详情链接
      */
     useText?: string;
+    /**
+     * 当前的具体使用说明
+     */
+    param?: string;
     /**
      * 是否100%的宽度
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alifd/chat",
-  "version": "0.3.37-beta.0",
+  "version": "0.3.37-beta.10",
   "description": "A configurable component library for chat built on React.",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -564,7 +564,8 @@
     "react-copy-to-clipboard": "^5.1.0",
     "react-photo-view": "^1.2.6",
     "sanitize-html": "~2.7.3",
-    "tslib": "^2.6.2"
+    "tslib": "^2.6.2",
+    "github-markdown-css": "^5.0.1"
   },
   "sideEffects": [
     "es/**/style.js",

package/es/ai-loading/__docs__/demo/basic/index.d.ts

@@ -1,8 +0,0 @@
-/**
- * @demo 基本使用
- * @en Basic
- * @order 1
- * @remarks ai-loading 加载动画组件的基本用法。
- * - Basic usage of `ai-loading`
- */
-import '@alifd/chat/es/ai-loading/style';

package/es/ai-loading/__docs__/demo/basic/index.js

@@ -1,16 +0,0 @@
-/**
- * @demo 基本使用
- * @en Basic
- * @order 1
- * @remarks ai-loading 加载动画组件的基本用法。
- * - Basic usage of `ai-loading`
- */
-import React from 'react';
-import ReactDOM from 'react-dom';
-import { AILoading } from '@alifd/chat';
-import '@alifd/chat/es/ai-loading/style';
-ReactDOM.render(React.createElement("div", { className: "origin-basic-demo" },
-    React.createElement("div", { style: {
-            width: '500px',
-        } },
-        React.createElement(AILoading, null))), mountNode);

package/es/balloon/__docs__/demo/basic/index.d.ts

@@ -1,9 +0,0 @@
-/**
- * @demo 类型
- * @en Style Type
- * @order 0
- * @remarks 常见气泡使用类型
- * - Common types of Balloon.
- */
-import '@alifd/chat/es/button/style';
-import '@alifd/chat/es/balloon/style';

package/es/balloon/__docs__/demo/basic/index.js

@@ -1,16 +0,0 @@
-/**
- * @demo 类型
- * @en Style Type
- * @order 0
- * @remarks 常见气泡使用类型
- * - Common types of Balloon.
- */
-import React from 'react';
-import ReactDOM from 'react-dom';
-import { Button, Balloon } from '@alifd/chat';
-import '@alifd/chat/es/button/style';
-import '@alifd/chat/es/balloon/style';
-const Demo = () => (React.createElement("div", { className: "balloon-container" },
-    React.createElement(Balloon, { v2: true, triggerType: "click", title: "Balloon Title", trigger: React.createElement(Button, { type: "secondary", size: "medium" }, "Default"), align: "br" }, "First performed around 1600, Hamlet tells the story of a prince whose duty to revenge his father's death entangles him in philosophical problems he can't solve."),
-    React.createElement(Balloon, { v2: true, type: "primary", triggerType: "click", title: "Balloon Title", trigger: React.createElement(Button, { type: "primary", size: "medium" }, "Primary"), align: "br", closable: false }, "First performed around 1600, Hamlet tells the story of a prince whose duty to revenge his father's death entangles him in philosophical problems he can't solve.")));
-ReactDOM.render(React.createElement(Demo, null), mountNode);

package/es/button/__docs__/demo/size/index.d.ts

@@ -1,8 +0,0 @@
-/**
- * @demo 按钮尺寸
- * @en Size
- * @order 1
- * @remarks 可以通过设置 `size` 属性控制按钮的尺寸，可选值为 `large` `medium` `small`，其中默认值为 `medium`。
- * - The size of a Button is controlled by a `size` attribute, supporting `large`, `medium`, `small`, the default value is `medium`.
- */
-import '@alifd/chat/es/button/style';