@nutui/nutui-react 3.0.0-beta.5 → 3.0.0-beta.7

package/dist/cjs/packages/divider/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-divider {
   display: flex;
   align-items: center;

package/dist/cjs/packages/drag/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-drag {
   position: fixed;
   z-index: 9997 !important;

package/dist/cjs/packages/elevator/style/elevator.scss

@@ -51,6 +51,8 @@
     }
 
     &-fixed {
+      display: flex;
+      align-items: center;
       width: 100%;
       position: absolute;
       top: 0;
@@ -58,13 +60,14 @@
       z-index: 1;
       padding: $elevator-list-item-padding;
       height: $elevator-list-item-code-height;
-      line-height: $elevator-list-item-code-line-height;
-      font-size: $elevator-list-item-code-font-size;
-      color: $elevator-list-fixed-color;
-      font-weight: $elevator-list-item-code-font-weight;
       background-color: $elevator-list-fixed-bg-color;
       box-sizing: border-box;
       box-shadow: $elevator-list-fixed-box-shadow;
+      &-title {
+        font-size: $elevator-list-item-code-font-size;
+        color: $elevator-list-fixed-color;
+        font-weight: $elevator-list-item-code-font-weight;
+      }
     }
   }
 

package/dist/cjs/packages/elevator/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-elevator {
   width: 100%;
   display: block;
@@ -46,6 +50,8 @@
   color: var(--nutui-color-primary, #ff0f23);
 }
 .nut-elevator-list-fixed {
+  display: flex;
+  align-items: center;
   width: 100%;
   position: absolute;
   top: 0;
@@ -53,14 +59,15 @@
   z-index: 1;
   padding: var(--nutui-elevator-list-item-padding, 0 20px);
   height: var(--nutui-elevator-list-item-code-height, 35px);
-  line-height: var(--nutui-elevator-list-item-code-line-height, 35px);
-  font-size: var(--nutui-elevator-list-item-code-font-size, var(--nutui-font-size-base, 14px));
-  color: var(--nutui-elevator-list-fixed-color, var(--nutui-color-primary, #ff0f23));
-  font-weight: var(--nutui-elevator-list-item-code-font-weight, var(--nutui-font-weight-bold, 600));
   background-color: var(--nutui-elevator-list-fixed-bg-color, #ffffff);
   box-sizing: border-box;
   box-shadow: var(--nutui-elevator-list-fixed-box-shadow, 0 0 10px #eee);
 }
+.nut-elevator-list-fixed-title {
+  font-size: var(--nutui-elevator-list-item-code-font-size, var(--nutui-font-size-base, 14px));
+  color: var(--nutui-elevator-list-fixed-color, var(--nutui-color-primary, #ff0f23));
+  font-weight: var(--nutui-elevator-list-item-code-font-weight, var(--nutui-font-weight-bold, 600));
+}
 .nut-elevator-code-current {
   position: absolute;
   right: var(--nutui-elevator-list-item-code-current-right, 60px);

package/dist/cjs/packages/ellipsis/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-ellipsis {
   display: flex;
 }

package/dist/cjs/packages/empty/empty.js

@@ -85,7 +85,7 @@ var Empty = function Empty(props) {
     }, title) : title, typeof description === 'string' ? /*#__PURE__*/ _react.default.createElement("div", {
         className: "".concat(classPrefix, "-description")
     }, description) : description, actions.length ? /*#__PURE__*/ _react.default.createElement("div", {
-        className: "".concat(classPrefix, "-actions")
+        className: "".concat(classPrefix, "-actions-").concat(size)
     }, actions.map(function(action, index) {
         var text = action.text, rest = (0, _object_without_properties._)(action, [
             "text"

package/dist/cjs/packages/empty/style/empty.scss

@@ -32,20 +32,24 @@
 
   &-title {
     margin-top: $empty-title-margin-top;
+    font-weight: $font-weight-bold;
     margin-bottom: $empty-title-margin-bottom;
     color: $color-title;
-    font-size: $font-size-base;
+    font-size: $font-size-l;
     line-height: $empty-title-line-height;
   }
 
   &-description {
-    margin-top: $empty-description-margin-top;
-    color: $color-text-help;
+    color: $color-text;
     font-size: $font-size-s;
     line-height: $empty-description-line-height;
   }
-
-  &-actions {
+  &-actions-base {
+    display: flex;
+    flex-direction: row;
+    margin-top: 24px;
+  }
+  &-actions-small {
     display: flex;
     flex-direction: row;
     margin-top: 16px;

package/dist/cjs/packages/empty/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-empty {
   box-sizing: border-box;
   width: 100%;
@@ -28,18 +32,23 @@
 }
 .nut-empty-title {
   margin-top: var(--nutui-empty-title-margin-top, 0px);
-  margin-bottom: var(--nutui-empty-title-margin-bottom, 8px);
+  font-weight: var(--nutui-font-weight-bold, 600);
+  margin-bottom: var(--nutui-empty-title-margin-bottom, 12px);
   color: var(--nutui-color-title, #1a1a1a);
-  font-size: var(--nutui-font-size-base, 14px);
-  line-height: var(--nutui-empty-title-line-height, var(--nutui-font-size-base, 14px));
+  font-size: var(--nutui-font-size-l, 16px);
+  line-height: var(--nutui-empty-title-line-height, var(--nutui-font-size-l, 16px));
 }
 .nut-empty-description {
-  margin-top: var(--nutui-empty-description-margin-top, 0px);
-  color: var(--nutui-color-text-help, #888b94);
+  color: var(--nutui-color-text, #505259);
   font-size: var(--nutui-font-size-s, 12px);
-  line-height: var(--nutui-empty-description-line-height, 1.2);
+  line-height: var(--nutui-empty-description-line-height, 1);
 }
-.nut-empty-actions {
+.nut-empty-actions-base {
+  display: flex;
+  flex-direction: row;
+  margin-top: 24px;
+}
+.nut-empty-actions-small {
   display: flex;
   flex-direction: row;
   margin-top: 16px;

package/dist/cjs/packages/fixednav/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-overlay {
   /* #ifdef rn */
   position: absolute;

package/dist/cjs/packages/form/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-cell-group {
   display: block;
 }

package/dist/cjs/packages/formitem/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-form-item {
   display: flex;
 }

package/dist/cjs/packages/grid/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-grid-item {
   display: flex;
   flex-direction: column;

package/dist/cjs/packages/griditem/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-grid-item {
   display: flex;
   flex-direction: column;

package/dist/cjs/packages/hoverbutton/hoverbutton.js

@@ -17,6 +17,7 @@ var _typings = require("../../utils/typings");
 var _index = require("../configprovider/index");
 var _index1 = /*#__PURE__*/ _interop_require_default._(require("../hoverbuttonitem/index"));
 var _index2 = /*#__PURE__*/ _interop_require_default._(require("../safearea/index"));
+var _utils = require("./utils");
 var defaultProps = (0, _object_spread._)({}, _typings.ComponentDefaults);
 var classPrefix = 'nut-hoverbutton';
 var HoverButton = function HoverButton(props) {
@@ -24,7 +25,7 @@ var HoverButton = function HoverButton(props) {
     var rtl = (0, _index.useRtl)();
     var baseStyle = (0, _object_spread._)({}, style);
     if (tabbarHeight) {
-        var bottom = tabbarHeight + 16;
+        var bottom = tabbarHeight + _utils.UI_BOTTOM_DISTANCE;
         baseStyle.bottom = "".concat(bottom, "px");
     }
     if (typeof zIndex !== 'undefined') {

package/dist/cjs/packages/hoverbutton/style/style.css

@@ -1,45 +1,70 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-hoverbutton-item-container {
   width: 40px;
   height: 40px;
   border-radius: 20px;
-  border: 1px solid var(--nutui-hoverbutton-item-border-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
-  background-color: var(--nutui-hoverbutton-item-background, var(--nutui-gray-1, #ffffff));
+  border: 1px solid var(--nutui-hoverbutton-item-border-color, rgba(0, 0, 0, 0.12));
+  background-color: var(--nutui-hoverbutton-item-background, var(--nutui-white-12));
 }
 .nut-hoverbutton-item-container:active, .nut-hoverbutton-item-container-active {
-  background-color: var(--nutui-hoverbutton-item-background-active, var(--nutui-gray-3, #f6f6f6));
+  background-color: var(--nutui-hoverbutton-item-background-active, rgba(247, 248, 252, 0.9));
 }
 .nut-hoverbutton-item-container-harmony {
-  margin-bottom: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-16, 16px));
+  margin-bottom: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-base, 8px));
 }
 .nut-hoverbutton-item-container-harmony:last-child {
   margin-bottom: 0;
 }
+.nut-hoverbutton-item-container-icontext {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.nut-hoverbutton-item-container-icontext .nut-icon {
+  display: block;
+  width: 14px;
+  height: 14px;
+  font-size: 14px;
+}
 .nut-hoverbutton-item-icon {
   width: 20px;
   height: 20px;
   margin: 9px;
-  color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7, #1a1a1a));
-  fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7, #1a1a1a));
+  color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-color-title, #1a1a1a));
+  fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-color-title, #1a1a1a));
 }
 .nut-hoverbutton-item-icon .nut-icon {
   display: block;
   width: 20px;
   height: 20px;
+  font-size: 20px;
 }
 .nut-hoverbutton-item-container:active .nut-hoverbutton-item-icon {
-  color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-6, #595959));
-  fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-6, #595959));
+  color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-color-title, #1a1a1a));
+  fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-color-title, #1a1a1a));
+}
+.nut-hoverbutton-item-text-icon {
+  width: 14px;
+  height: 5px;
+}
+.nut-hoverbutton-item-text {
+  font-size: 10px;
+  margin-top: 5px;
+  line-height: 9px;
 }
 
 .nut-hoverbutton {
   display: flex;
   flex-direction: column;
-  gap: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-16, 16px));
+  gap: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-base, 8px));
 }
 .nut-hoverbutton-container {
   position: fixed;
-  right: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-16, 16px));
-  bottom: var(--nutui-hoverbutton-position-bottom, 48px);
+  right: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-base, 8px));
+  bottom: var(--nutui-hoverbutton-position-bottom, 60px);
   z-index: 10;
 }
 .nut-hoverbutton-container-rn {
@@ -49,5 +74,5 @@
 [dir=rtl] .nut-hoverbutton-container,
 .nut-hoverbutton-container-rtl {
   right: auto;
-  left: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-16, 16px));
+  left: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-base, 8px));
 }

package/dist/cjs/packages/hoverbutton/utils.d.ts

@@ -0,0 +1 @@
+export declare const UI_BOTTOM_DISTANCE = 60;

package/dist/cjs/packages/hoverbutton/utils.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "UI_BOTTOM_DISTANCE", {
+    enumerable: true,
+    get: function() {
+        return UI_BOTTOM_DISTANCE;
+    }
+});
+var UI_BOTTOM_DISTANCE = 60;

package/dist/cjs/packages/hoverbuttonitem/hoverbuttonitem.js

@@ -9,35 +9,44 @@ Object.defineProperty(exports, "HoverButtonItem", {
     }
 });
 var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+var _define_property = require("@swc/helpers/_/_define_property");
 var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
 var _react = /*#__PURE__*/ _interop_require_default._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _typings = require("../../utils/typings");
+var _utils = require("./utils");
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     icon: null,
     onClick: function onClick(event) {}
 });
 var classPrefix = 'nut-hoverbutton-item';
 var HoverButtonItem = function HoverButtonItem(props) {
-    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), className = _$_object_spread.className, style = _$_object_spread.style, icon = _$_object_spread.icon, onClick = _$_object_spread.onClick;
+    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), className = _$_object_spread.className, children = _$_object_spread.children, style = _$_object_spread.style, icon = _$_object_spread.icon, onClick = _$_object_spread.onClick;
     var handleClick = function handleClick(event) {
         if (onClick) {
             onClick(event);
         }
     };
+    var renderBody = function renderBody() {
+        if (icon && !children) return /*#__PURE__*/ _react.default.createElement("div", {
+            className: "".concat(classPrefix, "-icon")
+        }, (0, _utils.getIcon)(icon));
+        if (icon && children) {
+            return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/ _react.default.createElement("div", {
+                className: (0, _classnames.default)((0, _define_property._)({}, "".concat(classPrefix, "-text-icon"), true))
+            }), (0, _utils.getIcon)(icon), /*#__PURE__*/ _react.default.createElement("div", {
+                className: (0, _classnames.default)((0, _define_property._)({}, "".concat(classPrefix, "-text"), true))
+            }, children));
+        }
+    };
     return /*#__PURE__*/ _react.default.createElement("div", {
         className: (0, _classnames.default)([
             "".concat(classPrefix, "-container"),
             className
-        ]),
+        ], (0, _define_property._)({}, "".concat(classPrefix, "-container-icontext"), icon && children)),
         style: style,
         onClick: handleClick
-    }, /*#__PURE__*/ _react.default.createElement("div", {
-        className: "".concat(classPrefix, "-icon")
-    }, /*#__PURE__*/ _react.default.isValidElement(icon) ? /*#__PURE__*/ _react.default.cloneElement(icon, {
-        // @ts-ignore
-        size: 20
-    }) : icon));
+    }, renderBody());
 };
 HoverButtonItem.displayName = 'NutHoverButtonItem';

package/dist/cjs/packages/hoverbuttonitem/style/hoverbuttonitem.scss

@@ -18,6 +18,19 @@
         margin-bottom: 0;
       }
     }
+
+    &-icontext {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+
+      .nut-icon {
+        display: block;
+        width: 14px;
+        height: 14px;
+        font-size: 14px;
+      }
+    }
   }
 
   &-icon {
@@ -31,6 +44,7 @@
       display: block;
       width: 20px;
       height: 20px;
+      font-size: 20px;
     }
   }
 
@@ -38,4 +52,15 @@
     color: $hoverbutton-item-icon-color-active;
     fill: $hoverbutton-item-icon-color-active;
   }
+
+  &-text-icon {
+    width: 14px;
+    height: 5px;
+  }
+
+  &-text {
+    font-size: 10px;
+    margin-top: 5px;
+    line-height: 9px;
+  }
 }

package/dist/cjs/packages/hoverbuttonitem/style/style.css

@@ -1,32 +1,57 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-hoverbutton-item-container {
   width: 40px;
   height: 40px;
   border-radius: 20px;
-  border: 1px solid var(--nutui-hoverbutton-item-border-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
-  background-color: var(--nutui-hoverbutton-item-background, var(--nutui-gray-1, #ffffff));
+  border: 1px solid var(--nutui-hoverbutton-item-border-color, rgba(0, 0, 0, 0.12));
+  background-color: var(--nutui-hoverbutton-item-background, var(--nutui-white-12));
 }
 .nut-hoverbutton-item-container:active, .nut-hoverbutton-item-container-active {
-  background-color: var(--nutui-hoverbutton-item-background-active, var(--nutui-gray-3, #f6f6f6));
+  background-color: var(--nutui-hoverbutton-item-background-active, rgba(247, 248, 252, 0.9));
 }
 .nut-hoverbutton-item-container-harmony {
-  margin-bottom: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-16, 16px));
+  margin-bottom: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-base, 8px));
 }
 .nut-hoverbutton-item-container-harmony:last-child {
   margin-bottom: 0;
 }
+.nut-hoverbutton-item-container-icontext {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.nut-hoverbutton-item-container-icontext .nut-icon {
+  display: block;
+  width: 14px;
+  height: 14px;
+  font-size: 14px;
+}
 .nut-hoverbutton-item-icon {
   width: 20px;
   height: 20px;
   margin: 9px;
-  color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7, #1a1a1a));
-  fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7, #1a1a1a));
+  color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-color-title, #1a1a1a));
+  fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-color-title, #1a1a1a));
 }
 .nut-hoverbutton-item-icon .nut-icon {
   display: block;
   width: 20px;
   height: 20px;
+  font-size: 20px;
 }
 .nut-hoverbutton-item-container:active .nut-hoverbutton-item-icon {
-  color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-6, #595959));
-  fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-6, #595959));
+  color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-color-title, #1a1a1a));
+  fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-color-title, #1a1a1a));
+}
+.nut-hoverbutton-item-text-icon {
+  width: 14px;
+  height: 5px;
+}
+.nut-hoverbutton-item-text {
+  font-size: 10px;
+  margin-top: 5px;
+  line-height: 9px;
 }

package/dist/cjs/packages/hoverbuttonitem/utils.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const getIcon: (icon: React.ReactNode) => string | number | boolean | React.ReactElement<any, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | null | undefined;

package/dist/cjs/packages/hoverbuttonitem/utils.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+Object.defineProperty(exports, "getIcon", {
+    enumerable: true,
+    get: function() {
+        return getIcon;
+    }
+});
+var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+var _react = /*#__PURE__*/ _interop_require_default._(require("react"));
+var getIcon = function getIcon(icon) {
+    return /*#__PURE__*/ _react.default.isValidElement(icon) ? /*#__PURE__*/ _react.default.cloneElement(icon, {
+        // @ts-ignore
+        className: 'nut-icon'
+    }) : icon;
+};

package/dist/cjs/packages/image/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-image {
   display: block;
   position: relative;

package/dist/cjs/packages/imagepreview/style/imagepreview.scss

@@ -72,6 +72,13 @@
       justify-content: center;
       height: 100%;
 
+      .nut-image,
+      .nut-video {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+
       .nut-image-preview-box {
         width: 100%;
       }

package/dist/cjs/packages/imagepreview/style/style.css

@@ -1,4 +1,8 @@
 @charset "UTF-8";
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-overlay {
   /* #ifdef rn */
   position: absolute;
@@ -146,9 +150,6 @@
   bottom: 0;
   left: 0;
   width: 100%;
-  /* #ifdef rn */
-  height: 300px;
-  /* #endif */
 }
 .nut-popup-bottom.nut-popup-round {
   border-radius: var(--nutui-popup-border-radius, 24px) var(--nutui-popup-border-radius, 24px) 0 0;
@@ -673,6 +674,14 @@
   justify-content: center;
   height: 100%;
 }
+.nut-imagepreview-swiper .nut-imagepreview-swiper-item .nut-image,
+.nut-imagepreview-swiper .nut-imagepreview-swiper-item .nut-video,
+.nut-imagepreview-swiper .nut-swiper-item .nut-image,
+.nut-imagepreview-swiper .nut-swiper-item .nut-video {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 .nut-imagepreview-swiper .nut-imagepreview-swiper-item .nut-image-preview-box,
 .nut-imagepreview-swiper .nut-swiper-item .nut-image-preview-box {
   width: 100%;

package/dist/cjs/packages/indicator/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-indicator {
   display: flex;
   flex-direction: row;

package/dist/cjs/packages/infiniteloading/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-infiniteloading {
   display: block;
   width: 100%;

package/dist/cjs/packages/input/style/style.css

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-input {
   position: relative;
   display: flex;