@antv/gpt-vis 1.0.0-beta.2 → 1.0.0

package/dist/cjs/vis/scatter/index.js

@@ -29,7 +29,7 @@ var Scatter = (options) => {
   let chart = null;
   const render = (config) => {
     var _a;
-    const { data = [], theme = chartTheme, title, style = {} } = config;
+    const { data = [], theme = chartTheme, title, axisXTitle, axisYTitle, style = {} } = config;
     if (chart) {
       chart.destroy();
     }
@@ -60,14 +60,18 @@ var Scatter = (options) => {
       encode,
       legend: hasGroupField ? { color: { position: "top" } } : false,
       scale: scaleConfig,
+      axis: {
+        x: { title: axisXTitle ?? "x" },
+        y: { title: axisYTitle ?? "y" }
+      },
       style: {
         lineWidth: 1
       },
       tooltip: {
         title: (d) => (d == null ? void 0 : d.group) ? d.group : false,
         items: [
-          { channel: "x", name: "x" },
-          { channel: "y", name: "y" }
+          { channel: "x", name: axisXTitle ?? "x" },
+          { channel: "y", name: axisYTitle ?? "y" }
         ]
       },
       viewStyle: {

package/dist/cjs/vis/waterfall/index.js

@@ -116,7 +116,7 @@ var Waterfall = (options) => {
           style: {
             maxWidth: 60,
             stroke: "#666",
-            radius: 4,
+            ...theme !== "academy" ? { radius: 4 } : {},
             fill: (d) => {
               return d.isTotal || d.isIntermediateTotal ? totalColor : d.__value__ > 0 ? positiveColor : negativeColor;
             }

package/dist/esm/gpt-vis/index.js

@@ -159,7 +159,7 @@ export var GPTVis = /*#__PURE__*/function () {
           this.wrapperInstance = createVisWrapper(this.options.container, {
             chartType: type,
             syntax: config,
-            locale: this.options.locale || 'zh-CN'
+            locale: this.options.locale || 'en-US'
           });
         } else {
           this.wrapperInstance.update(config);

package/dist/esm/vis/dual-axes/index.js

@@ -1,3 +1,9 @@
+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 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); }
 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 _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); }
@@ -142,11 +148,12 @@ export var DualAxes = function DualAxes(options) {
               title: item.axisYTitle || ''
             }
           },
-          style: {
-            columnWidthRatio: 0.8,
+          style: _objectSpread({
+            columnWidthRatio: 0.8
+          }, theme !== 'academy' ? {
             radiusTopLeft: 4,
             radiusTopRight: 4
-          }
+          } : {})
         };
       } else {
         // line type

package/dist/esm/vis/fishbone-diagram/index.js

@@ -8,7 +8,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { Graph, treeToGraphData } from '@antv/g6';
-import { getBackgroundColor, normalizePalette } from "../../util/theme";
+import { getBackgroundColor, getTheme, normalizePalette } from "../../util/theme";
 
 /**
  * FishboneDiagramConfig defines the configuration for rendering the fishbone diagram.
@@ -126,13 +126,14 @@ export var FishboneDiagram = function FishboneDiagram(options) {
       height: height,
       autoFit: 'view',
       autoResize: true,
-      padding: 20,
-      theme: chartTheme,
+      padding: title ? [46, 20, 20, 20] : 20,
+      theme: getTheme(theme),
       plugins: title ? [{
         key: 'title',
         type: 'title',
         title: title,
-        titleFill: isDark ? '#e0e6ed' : '#1a1a2e'
+        titleFill: isDark ? '#e0e6ed' : '#000',
+        titleFontFamily: 'sans-serif'
       }] : [],
       data: graphData,
       node: {
@@ -141,7 +142,7 @@ export var FishboneDiagram = function FishboneDiagram(options) {
           var _d$depth;
           var depth = (_d$depth = d.depth) !== null && _d$depth !== void 0 ? _d$depth : 0;
           var nodeStyle = {
-            radius: 8,
+            radius: theme === 'academy' ? 0 : 8,
             size: getNodeSize(String(d.id), depth),
             labelText: String(d.id),
             labelPlacement: 'left',

package/dist/esm/vis/flow-diagram/index.js

@@ -19,7 +19,7 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import { ExtensionCategory, Graph, HoverActivate, idOf, register } from '@antv/g6';
-import { getBackgroundColor, normalizePalette } from "../../util/theme";
+import { getBackgroundColor, getTheme, normalizePalette } from "../../util/theme";
 
 /**
  * FlowDiagramConfig defines the configuration for rendering the flow diagram.
@@ -75,13 +75,16 @@ function escapeHtml() {
 function createNodeHTML(d, color) {
   var _d$data, _d$states, _d$states2;
   var selectedBorderColor = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '#000';
+  var theme = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'default';
   var text = escapeHtml(((_d$data = d.data) === null || _d$data === void 0 ? void 0 : _d$data.text) || '');
   var isHovered = (_d$states = d.states) === null || _d$states === void 0 ? void 0 : _d$states.includes('active');
   var isSelected = (_d$states2 = d.states) === null || _d$states2 === void 0 ? void 0 : _d$states2.includes('selected');
   var nodeColor = isHovered ? ACTIVE_COLOR : color;
-  return "\n    <div\n      data-node-key=\"".concat(escapeHtml(String(d.id)), "\"\n      style=\"\n        box-sizing: border-box;\n        width: ").concat(DEFAULT_NODE_WIDTH, "px;\n        min-height: ").concat(DEFAULT_NODE_HEIGHT, "px;\n        padding: 16px;\n        background: ").concat(nodeColor, ";\n        border: 3px solid ").concat(isSelected ? selectedBorderColor : nodeColor, ";\n        border-radius: 16px;\n        color: #fff;\n        font-size: 16px;\n        font-weight: 600;\n        line-height: 22px;\n        text-align: center;\n        white-space: normal;\n        word-break: break-word;\n        overflow-wrap: anywhere;\n        display: flex;\n        align-items: center;\n        justify-content: center;\n        cursor: pointer;\n      \"\n    >\n      <div style=\"width: 100%;\">\n        ").concat(text, "\n      </div>\n    </div>\n  ");
+  var borderRadius = theme === 'academy' ? '0px' : '8px';
+  return "\n    <div\n      data-node-key=\"".concat(escapeHtml(String(d.id)), "\"\n      style=\"\n        box-sizing: border-box;\n        width: ").concat(DEFAULT_NODE_WIDTH, "px;\n        min-height: ").concat(DEFAULT_NODE_HEIGHT, "px;\n        padding: 16px;\n        background: ").concat(nodeColor, ";\n        border: 3px solid ").concat(isSelected ? selectedBorderColor : nodeColor, ";\n        border-radius: ").concat(borderRadius, ";\n        color: #fff;\n        font-size: 16px;\n        font-weight: 600;\n        line-height: 22px;\n        text-align: center;\n        white-space: normal;\n        word-break: break-word;\n        overflow-wrap: anywhere;\n        display: flex;\n        align-items: center;\n        justify-content: center;\n        cursor: pointer;\n      \"\n    >\n      <div style=\"width: 100%;\">\n        ").concat(text, "\n      </div>\n    </div>\n  ");
 }
 function measureAndUpdateNodeSizes(graph, container, nodeColorMap, selectedBorderColor) {
+  var theme = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 'default';
   var nodes = graph.getNodeData();
   var updatedNodes = nodes.map(function (node) {
     var dom = container.querySelector("[data-node-key=\"".concat(CSS.escape(String(node.id)), "\"]"));
@@ -95,7 +98,7 @@ function measureAndUpdateNodeSizes(graph, container, nodeColorMap, selectedBorde
         size: [DEFAULT_NODE_WIDTH, height],
         dx: -DEFAULT_NODE_WIDTH / 2,
         dy: -height / 2,
-        innerHTML: createNodeHTML(node, nodeColorMap.get(String(node.id)) || '#1783FF', selectedBorderColor)
+        innerHTML: createNodeHTML(node, nodeColorMap.get(String(node.id)) || '#1783FF', selectedBorderColor, theme)
       }
     };
   });
@@ -235,29 +238,33 @@ export var FlowDiagram = function FlowDiagram(options) {
       container: containerEl,
       width: width,
       height: height,
-      theme: theme,
+      theme: getTheme(theme),
       data: {
         nodes: g6Nodes,
         edges: g6Edges
       },
       autoFit: 'view',
       autoResize: true,
-      padding: 20,
+      padding: title ? [46, 20, 20, 20] : 20,
       plugins: title ? [{
         key: 'title',
         type: 'title',
         title: title,
-        titleFill: isDark ? '#e0e6ed' : '#1a1a2e'
+        titleFill: isDark ? '#e0e6ed' : '#000',
+        titleFontFamily: 'sans-serif'
       }] : [],
       node: {
         type: 'html',
         style: function style(d) {
+          var _d$style;
           var color = nodeColorMap.get(String(d.id)) || colors[0];
+          var size = ((_d$style = d.style) === null || _d$style === void 0 ? void 0 : _d$style.size) || [DEFAULT_NODE_WIDTH, DEFAULT_NODE_HEIGHT];
+          var height = size[1];
           return {
-            size: [DEFAULT_NODE_WIDTH, DEFAULT_NODE_HEIGHT],
+            size: size,
             dx: -DEFAULT_NODE_WIDTH / 2,
-            dy: -DEFAULT_NODE_HEIGHT / 2,
-            innerHTML: createNodeHTML(d, color, selectedBorder),
+            dy: -height / 2,
+            innerHTML: createNodeHTML(d, color, selectedBorder, theme),
             ports: [{
               placement: 'top'
             }, {
@@ -317,7 +324,7 @@ export var FlowDiagram = function FlowDiagram(options) {
     // Measure real node heights after initial render
     graph.once('afterrender', function () {
       if (graph) {
-        measureAndUpdateNodeSizes(graph, containerEl, nodeColorMap, selectedBorder);
+        measureAndUpdateNodeSizes(graph, containerEl, nodeColorMap, selectedBorder, theme);
       }
     });
   };

package/dist/esm/vis/indented-tree/index.js

@@ -27,7 +27,7 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol
 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; }
 import { Badge, BaseBehavior, BaseNode, CommonEvent, ExtensionCategory, Graph, NodeEvent, Polyline, iconfont, register, subStyleProps, treeToGraphData } from '@antv/g6';
-import { getBackgroundColor, normalizePalette } from "../../util/theme";
+import { getBackgroundColor, getTheme, normalizePalette } from "../../util/theme";
 
 // ---------------------------------------------------------------------------
 // Official G6 indented-tree implementation (adapted for GPT-Vis)
@@ -449,7 +449,8 @@ export var IndentedTree = function IndentedTree(options) {
       height: height,
       autoFit: 'view',
       autoResize: true,
-      padding: 20,
+      theme: getTheme(theme),
+      padding: title ? [46, 20, 20, 20] : 20,
       data: graphData,
       node: {
         type: GPT_VIS_INDENTED_NODE,
@@ -461,8 +462,11 @@ export var IndentedTree = function IndentedTree(options) {
           labelBackground: function labelBackground(datum) {
             return datum.id === rootId;
           },
-          labelBackgroundRadius: 0,
+          labelBackgroundRadius: theme === 'academy' ? 0 : 4,
           labelBackgroundFill: (_palette$ = palette[0]) !== null && _palette$ !== void 0 ? _palette$ : '#1783FF',
+          labelPadding: function labelPadding(datum) {
+            return datum.id === rootId ? [2, 8] : 0;
+          },
           labelFill: function labelFill(datum) {
             return datum.id === rootId ? '#fff' : isDark ? '#d0d0d0' : '#666';
           },
@@ -538,7 +542,8 @@ export var IndentedTree = function IndentedTree(options) {
         key: 'title',
         type: 'title',
         title: title,
-        titleFill: isDark ? '#e0e6ed' : '#1a1a2e'
+        titleFill: isDark ? '#e0e6ed' : '#000',
+        titleFontFamily: 'sans-serif'
       }] : []
     });
     graph.render();

package/dist/esm/vis/mindmap/index.js

@@ -15,7 +15,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { Graph, idOf, positionOf, treeToGraphData } from '@antv/g6';
-import { getBackgroundColor, normalizePalette } from "../../util/theme";
+import { getBackgroundColor, getTheme, normalizePalette } from "../../util/theme";
 
 /**
  * MindmapConfig defines the configuration for rendering the mindmap.
@@ -179,16 +179,17 @@ export var Mindmap = function Mindmap(options) {
       height: height,
       autoFit: 'view',
       autoResize: true,
-      padding: 20,
+      padding: title ? [46, 20, 20, 20] : 20,
       zoomRange: [0.1, 5],
       zoom: 1,
-      theme: chartTheme,
+      theme: getTheme(theme),
       data: graphData,
       plugins: title ? [{
         key: 'title',
         type: 'title',
         title: title,
-        titleFill: isDark ? '#e0e6ed' : '#1a1a2e'
+        titleFill: isDark ? '#e0e6ed' : '#000',
+        titleFontFamily: 'sans-serif'
       }] : [],
       node: {
         type: 'rect',
@@ -219,7 +220,7 @@ export var Mindmap = function Mindmap(options) {
           var base = {
             size: [nodeWidth, nodeHeight],
             dx: dx,
-            radius: 8,
+            radius: theme === 'academy' ? 0 : 8,
             labelText: label,
             labelPlacement: 'center',
             labelFontSize: fontSize,

package/dist/esm/vis/network-graph/index.js

@@ -1,5 +1,5 @@
 import { Graph } from '@antv/g6';
-import { getBackgroundColor, normalizePalette } from "../../util/theme";
+import { getBackgroundColor, getTheme, normalizePalette } from "../../util/theme";
 
 /**
  * NetworkGraphConfig defines the configuration for rendering the network graph.
@@ -180,7 +180,8 @@ export var NetworkGraph = function NetworkGraph(options) {
       height: height,
       autoFit: 'view',
       autoResize: true,
-      padding: 24,
+      theme: getTheme(theme),
+      padding: title ? [46, 20, 20, 20] : 20,
       data: {
         nodes: nodeData,
         edges: edgeData
@@ -197,7 +198,8 @@ export var NetworkGraph = function NetworkGraph(options) {
         key: 'title',
         type: 'title',
         title: title,
-        titleFill: isDark ? '#e0e6ed' : '#1a1a2e'
+        titleFill: isDark ? '#e0e6ed' : '#000',
+        titleFontFamily: 'sans-serif'
       }] : []
     });
     graph.render();

package/dist/esm/vis/organization-chart/index.js

@@ -5,7 +5,7 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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; }
 import { Graph } from '@antv/g6';
-import { getBackgroundColor, normalizePalette } from "../../util/theme";
+import { getBackgroundColor, getTheme, normalizePalette } from "../../util/theme";
 
 /**
  * OrganizationChartConfig defines the configuration for rendering the organization chart.
@@ -153,7 +153,8 @@ export var OrganizationChart = function OrganizationChart(options) {
       height: height,
       autoFit: 'view',
       autoResize: true,
-      padding: 24,
+      theme: getTheme(theme),
+      padding: title ? [46, 20, 20, 20] : 20,
       data: {
         nodes: nodeData,
         edges: edgeData
@@ -189,7 +190,8 @@ export var OrganizationChart = function OrganizationChart(options) {
         key: 'title',
         type: 'title',
         title: title,
-        titleFill: isDark ? '#e0e6ed' : '#1a1a2e'
+        titleFill: isDark ? '#e0e6ed' : '#000',
+        titleFontFamily: 'sans-serif'
       }] : [])),
       node: {
         type: 'rect',
@@ -203,7 +205,7 @@ export var OrganizationChart = function OrganizationChart(options) {
           },
           stroke: isDark ? '#555' : '#e8ebf0',
           lineWidth: 1,
-          radius: 8,
+          radius: theme === 'academy' ? 0 : 8,
           // Use official label wrapping/ellipsis for BOTH name & description.
           // 1 line name + up to 2 lines description => total maxLines = 3.
           labelText: function labelText(d) {

package/dist/esm/vis/scatter/index.d.ts

@@ -14,6 +14,8 @@ export interface ScatterConfig {
     type?: 'scatter';
     data: ScatterDataItem[];
     title?: string;
+    axisXTitle?: string;
+    axisYTitle?: string;
     theme?: 'default' | 'academy' | 'dark';
     style?: {
         backgroundColor?: string;

package/dist/esm/vis/scatter/index.js

@@ -55,6 +55,8 @@ export var Scatter = function Scatter(options) {
       _config$theme = config.theme,
       theme = _config$theme === void 0 ? chartTheme : _config$theme,
       title = config.title,
+      axisXTitle = config.axisXTitle,
+      axisYTitle = config.axisYTitle,
       _config$style = config.style,
       style = _config$style === void 0 ? {} : _config$style;
 
@@ -119,6 +121,14 @@ export var Scatter = function Scatter(options) {
         }
       } : false,
       scale: scaleConfig,
+      axis: {
+        x: {
+          title: axisXTitle !== null && axisXTitle !== void 0 ? axisXTitle : 'x'
+        },
+        y: {
+          title: axisYTitle !== null && axisYTitle !== void 0 ? axisYTitle : 'y'
+        }
+      },
       style: {
         lineWidth: 1
       },
@@ -128,10 +138,10 @@ export var Scatter = function Scatter(options) {
         },
         items: [{
           channel: 'x',
-          name: 'x'
+          name: axisXTitle !== null && axisXTitle !== void 0 ? axisXTitle : 'x'
         }, {
           channel: 'y',
-          name: 'y'
+          name: axisYTitle !== null && axisYTitle !== void 0 ? axisYTitle : 'y'
         }]
       },
       viewStyle: {

package/dist/esm/vis/waterfall/index.js

@@ -181,14 +181,16 @@ export var Waterfall = function Waterfall(options) {
           y: ['__start__', '__end__'],
           color: 'category'
         },
-        style: {
+        style: _objectSpread(_objectSpread({
           maxWidth: 60,
-          stroke: '#666',
-          radius: 4,
+          stroke: '#666'
+        }, theme !== 'academy' ? {
+          radius: 4
+        } : {}), {}, {
           fill: function fill(d) {
             return d.isTotal || d.isIntermediateTotal ? totalColor : d.__value__ > 0 ? positiveColor : negativeColor;
           }
-        },
+        }),
         labels: [{
           text: '__value__',
           position: 'inside',