jrs-react 1.2.8 → 1.2.10

package/build/index.es.js

@@ -6768,14 +6768,14 @@ const TFoot = ({
   return /*#__PURE__*/React$1.createElement(React$1.Fragment, null, /*#__PURE__*/React$1.createElement("tfoot", null, trs));
 };
 
-function _extends$3() {
-  return _extends$3 = Object.assign ? Object.assign.bind() : function (n) {
+function _extends() {
+  return _extends = Object.assign ? Object.assign.bind() : function (n) {
     for (var e = 1; e < arguments.length; e++) {
       var t = arguments[e];
       for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
     }
     return n;
-  }, _extends$3.apply(null, arguments);
+  }, _extends.apply(null, arguments);
 }
 
 styled.tbody`
@@ -6859,7 +6859,7 @@ styled.tr`
     }
 `;
 const GroupHeader = props => {
-  return /*#__PURE__*/React$1.createElement(GroupColumns, _extends$3({
+  return /*#__PURE__*/React$1.createElement(GroupColumns, _extends({
     trClassName: 'jr-group-header'
   }, props));
 };
@@ -6870,7 +6870,7 @@ styled.tr`
     }
 `;
 const GroupFooter = props => {
-  return /*#__PURE__*/React$1.createElement(GroupColumns, _extends$3({
+  return /*#__PURE__*/React$1.createElement(GroupColumns, _extends({
     trClassName: 'jr-group-footer'
   }, props));
 };
@@ -6991,7 +6991,7 @@ const TBody = ({
   };
   return /*#__PURE__*/React$1.createElement(React$1.Fragment, null, /*#__PURE__*/React$1.createElement("tbody", {
     key: `tbody${tbodyIndex}`
-  }, groupData?.length > 0 && /*#__PURE__*/React$1.createElement(GroupHeader, _extends$3({
+  }, groupData?.length > 0 && /*#__PURE__*/React$1.createElement(GroupHeader, _extends({
     groupData: groupData,
     columns: groupHeader
   }, neededProps)), groupData?.map?.((record, trIndex) => {
@@ -7005,13 +7005,13 @@ const TBody = ({
           groupIndex: tbodyIndex
         });
       }
-    }, /*#__PURE__*/React$1.createElement(Tds, _extends$3({
+    }, /*#__PURE__*/React$1.createElement(Tds, _extends({
       record: record,
       trIndex: trIndex
     }, neededProps, {
       leafColumns: leafColumns
     })));
-  }), groupData?.length > 0 && /*#__PURE__*/React$1.createElement(GroupFooter, _extends$3({
+  }), groupData?.length > 0 && /*#__PURE__*/React$1.createElement(GroupFooter, _extends({
     groupData: groupData,
     columns: groupFooter
   }, neededProps))));
@@ -7177,62 +7177,6 @@ const StyledJRTable = styled.div`
     }    
 `;
 
-var _path$1;
-function _extends$2() { return _extends$2 = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$2.apply(null, arguments); }
-var SvgX = function SvgX(props) {
-  return /*#__PURE__*/reactExports.createElement("svg", _extends$2({
-    xmlns: "http://www.w3.org/2000/svg",
-    width: 24,
-    height: 24,
-    fill: "none",
-    stroke: "currentColor",
-    strokeLinecap: "round",
-    strokeLinejoin: "round",
-    strokeWidth: 2
-  }, props), _path$1 || (_path$1 = /*#__PURE__*/reactExports.createElement("path", {
-    d: "M18 6 6 18M6 6l12 12"
-  })));
-};
-
-var _rect;
-function _extends$1() { return _extends$1 = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$1.apply(null, arguments); }
-var SvgSquare = function SvgSquare(props) {
-  return /*#__PURE__*/reactExports.createElement("svg", _extends$1({
-    xmlns: "http://www.w3.org/2000/svg",
-    width: 24,
-    height: 24,
-    fill: "none",
-    stroke: "currentColor",
-    strokeLinecap: "round",
-    strokeLinejoin: "round",
-    strokeWidth: 2
-  }, props), _rect || (_rect = /*#__PURE__*/reactExports.createElement("rect", {
-    width: 18,
-    height: 18,
-    x: 3,
-    y: 3,
-    rx: 2,
-    ry: 2
-  })));
-};
-
-var _path;
-function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-var SvgMinus = function SvgMinus(props) {
-  return /*#__PURE__*/reactExports.createElement("svg", _extends({
-    xmlns: "http://www.w3.org/2000/svg",
-    width: 24,
-    height: 24,
-    fill: "none",
-    stroke: "currentColor",
-    strokeLinecap: "round",
-    strokeLinejoin: "round",
-    strokeWidth: 2
-  }, props), _path || (_path = /*#__PURE__*/reactExports.createElement("path", {
-    d: "M5 12h14"
-  })));
-};
-
 function JRButton({
   icon,
   children,
@@ -7387,12 +7331,7 @@ class TitleBar extends React$1.Component {
       config: this.props.title ?? '',
       me: this.props.window,
       className: 'title'
-    }), /*#__PURE__*/React$1.createElement("nav", null, /*#__PURE__*/React$1.createElement(JRButton, {
-      icon: /*#__PURE__*/React$1.createElement(SvgMinus, null)
-    }), /*#__PURE__*/React$1.createElement(JRButton, {
-      icon: /*#__PURE__*/React$1.createElement(SvgSquare, null)
-    }), this.props.window.props.setOpen ? /*#__PURE__*/React$1.createElement(JRButton, {
-      icon: /*#__PURE__*/React$1.createElement(SvgX, null),
+    }), /*#__PURE__*/React$1.createElement("nav", null, /*#__PURE__*/React$1.createElement(JRButton, null), /*#__PURE__*/React$1.createElement(JRButton, null), this.props.window.props.setOpen ? /*#__PURE__*/React$1.createElement(JRButton, {
       className: 'danger',
       onClick: () => {
         this.props.window.props.setOpen(false);
@@ -7839,11 +7778,9 @@ class JRWindow extends JRFrame {
     super(props);
     this.ref = /*#__PURE__*/React$1.createRef();
     this.titleBarRef = /*#__PURE__*/React$1.createRef();
-    // if(this.props.popup===true)this.renderer=this.renderWindow
     this.init();
   }
   componentWillUpdate(prevProps, prevState, snapshot) {
-    po('componentWillUpdate-------------------------');
     if (this.props.popup === true && this.props.open === true && prevProps.open === false) {
       this.props.onOpen?.bind(this)();
     }
@@ -7863,10 +7800,6 @@ class JRWindow extends JRFrame {
       $width: this.width,
       $height: this.height,
       $thick: this.thick
-      // onMouseDown={()=>{
-      //     po('onFocus')
-      //     this.ref.current.style.zIndex=100
-      // }}
     }, /*#__PURE__*/React$1.createElement("main", null, /*#__PURE__*/React$1.createElement(TitleBar, {
       titleBarRef: this.titleBarRef,
       windowRef: this.ref,
@@ -8645,4 +8578,4 @@ class JRTestReact extends JRSubmit {
   }
 }
 
-export { JRFields, JRFrame, JRSubmit, JRTable, JRTestReact };
+export { JRButton, JRFields, JRFrame, JRSubmit, JRTable, JRTestReact };

package/build/index.js

@@ -6776,14 +6776,14 @@ const TFoot = ({
   return /*#__PURE__*/React$1.createElement(React$1.Fragment, null, /*#__PURE__*/React$1.createElement("tfoot", null, trs));
 };
 
-function _extends$3() {
-  return _extends$3 = Object.assign ? Object.assign.bind() : function (n) {
+function _extends() {
+  return _extends = Object.assign ? Object.assign.bind() : function (n) {
     for (var e = 1; e < arguments.length; e++) {
       var t = arguments[e];
       for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
     }
     return n;
-  }, _extends$3.apply(null, arguments);
+  }, _extends.apply(null, arguments);
 }
 
 styled__default["default"].tbody`
@@ -6867,7 +6867,7 @@ styled__default["default"].tr`
     }
 `;
 const GroupHeader = props => {
-  return /*#__PURE__*/React$1.createElement(GroupColumns, _extends$3({
+  return /*#__PURE__*/React$1.createElement(GroupColumns, _extends({
     trClassName: 'jr-group-header'
   }, props));
 };
@@ -6878,7 +6878,7 @@ styled__default["default"].tr`
     }
 `;
 const GroupFooter = props => {
-  return /*#__PURE__*/React$1.createElement(GroupColumns, _extends$3({
+  return /*#__PURE__*/React$1.createElement(GroupColumns, _extends({
     trClassName: 'jr-group-footer'
   }, props));
 };
@@ -6999,7 +6999,7 @@ const TBody = ({
   };
   return /*#__PURE__*/React$1.createElement(React$1.Fragment, null, /*#__PURE__*/React$1.createElement("tbody", {
     key: `tbody${tbodyIndex}`
-  }, groupData?.length > 0 && /*#__PURE__*/React$1.createElement(GroupHeader, _extends$3({
+  }, groupData?.length > 0 && /*#__PURE__*/React$1.createElement(GroupHeader, _extends({
     groupData: groupData,
     columns: groupHeader
   }, neededProps)), groupData?.map?.((record, trIndex) => {
@@ -7013,13 +7013,13 @@ const TBody = ({
           groupIndex: tbodyIndex
         });
       }
-    }, /*#__PURE__*/React$1.createElement(Tds, _extends$3({
+    }, /*#__PURE__*/React$1.createElement(Tds, _extends({
       record: record,
       trIndex: trIndex
     }, neededProps, {
       leafColumns: leafColumns
     })));
-  }), groupData?.length > 0 && /*#__PURE__*/React$1.createElement(GroupFooter, _extends$3({
+  }), groupData?.length > 0 && /*#__PURE__*/React$1.createElement(GroupFooter, _extends({
     groupData: groupData,
     columns: groupFooter
   }, neededProps))));
@@ -7185,62 +7185,6 @@ const StyledJRTable = styled__default["default"].div`
     }    
 `;
 
-var _path$1;
-function _extends$2() { return _extends$2 = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$2.apply(null, arguments); }
-var SvgX = function SvgX(props) {
-  return /*#__PURE__*/reactExports.createElement("svg", _extends$2({
-    xmlns: "http://www.w3.org/2000/svg",
-    width: 24,
-    height: 24,
-    fill: "none",
-    stroke: "currentColor",
-    strokeLinecap: "round",
-    strokeLinejoin: "round",
-    strokeWidth: 2
-  }, props), _path$1 || (_path$1 = /*#__PURE__*/reactExports.createElement("path", {
-    d: "M18 6 6 18M6 6l12 12"
-  })));
-};
-
-var _rect;
-function _extends$1() { return _extends$1 = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends$1.apply(null, arguments); }
-var SvgSquare = function SvgSquare(props) {
-  return /*#__PURE__*/reactExports.createElement("svg", _extends$1({
-    xmlns: "http://www.w3.org/2000/svg",
-    width: 24,
-    height: 24,
-    fill: "none",
-    stroke: "currentColor",
-    strokeLinecap: "round",
-    strokeLinejoin: "round",
-    strokeWidth: 2
-  }, props), _rect || (_rect = /*#__PURE__*/reactExports.createElement("rect", {
-    width: 18,
-    height: 18,
-    x: 3,
-    y: 3,
-    rx: 2,
-    ry: 2
-  })));
-};
-
-var _path;
-function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
-var SvgMinus = function SvgMinus(props) {
-  return /*#__PURE__*/reactExports.createElement("svg", _extends({
-    xmlns: "http://www.w3.org/2000/svg",
-    width: 24,
-    height: 24,
-    fill: "none",
-    stroke: "currentColor",
-    strokeLinecap: "round",
-    strokeLinejoin: "round",
-    strokeWidth: 2
-  }, props), _path || (_path = /*#__PURE__*/reactExports.createElement("path", {
-    d: "M5 12h14"
-  })));
-};
-
 function JRButton({
   icon,
   children,
@@ -7395,12 +7339,7 @@ class TitleBar extends React$1.Component {
       config: this.props.title ?? '',
       me: this.props.window,
       className: 'title'
-    }), /*#__PURE__*/React$1.createElement("nav", null, /*#__PURE__*/React$1.createElement(JRButton, {
-      icon: /*#__PURE__*/React$1.createElement(SvgMinus, null)
-    }), /*#__PURE__*/React$1.createElement(JRButton, {
-      icon: /*#__PURE__*/React$1.createElement(SvgSquare, null)
-    }), this.props.window.props.setOpen ? /*#__PURE__*/React$1.createElement(JRButton, {
-      icon: /*#__PURE__*/React$1.createElement(SvgX, null),
+    }), /*#__PURE__*/React$1.createElement("nav", null, /*#__PURE__*/React$1.createElement(JRButton, null), /*#__PURE__*/React$1.createElement(JRButton, null), this.props.window.props.setOpen ? /*#__PURE__*/React$1.createElement(JRButton, {
       className: 'danger',
       onClick: () => {
         this.props.window.props.setOpen(false);
@@ -7847,11 +7786,9 @@ class JRWindow extends JRFrame {
     super(props);
     this.ref = /*#__PURE__*/React$1.createRef();
     this.titleBarRef = /*#__PURE__*/React$1.createRef();
-    // if(this.props.popup===true)this.renderer=this.renderWindow
     this.init();
   }
   componentWillUpdate(prevProps, prevState, snapshot) {
-    po('componentWillUpdate-------------------------');
     if (this.props.popup === true && this.props.open === true && prevProps.open === false) {
       this.props.onOpen?.bind(this)();
     }
@@ -7871,10 +7808,6 @@ class JRWindow extends JRFrame {
       $width: this.width,
       $height: this.height,
       $thick: this.thick
-      // onMouseDown={()=>{
-      //     po('onFocus')
-      //     this.ref.current.style.zIndex=100
-      // }}
     }, /*#__PURE__*/React$1.createElement("main", null, /*#__PURE__*/React$1.createElement(TitleBar, {
       titleBarRef: this.titleBarRef,
       windowRef: this.ref,
@@ -8653,6 +8586,7 @@ class JRTestReact extends JRSubmit {
   }
 }
 
+exports.JRButton = JRButton;
 exports.JRFields = JRFields;
 exports.JRFrame = JRFrame;
 exports.JRSubmit = JRSubmit;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "jrs-react",
-	"version": "1.2.8",
+	"version": "1.2.10",
 	"description": "",
 	"main": "build/index.js",
 	"module": "build/index.es.js",

package/src/app/window/WindowApp.jsx

@@ -19,7 +19,7 @@ export default function WindowApp() {
 			setOpen(!open)
 		}}
 	>Open</button>
-	<JRTable
+	{/* <JRTable
 		title={function(){
 			return `共: ${this.getValue()?.length ??0 }筆`
 		}}
@@ -37,10 +37,10 @@ export default function WindowApp() {
 			,{name:'birthday',label:'生日',type:JRText}
 		]}
 		resizableColumns={true}
-	/>
+	/> */}
 	
 	
-	<JRFields
+	{/* <JRFields
 		title={function(){
 			return 'JRFields'//this.getValue()?.name
 		}}
@@ -80,7 +80,7 @@ export default function WindowApp() {
 				>Clear</button>
 			</>
 		}}
-	/> 
+	/>  */}
 
 	<JRWindow
 		title={'JRWindow'}

package/src/components/JRWindow/JRWindow.jsx

@@ -55,11 +55,9 @@ export default class JRWindow extends JRFrame {
         super(props)
         this.ref=React.createRef()
         this.titleBarRef=React.createRef()
-        // if(this.props.popup===true)this.renderer=this.renderWindow
         this.init()
     }
     componentWillUpdate(prevProps, prevState, snapshot){
-        po('componentWillUpdate-------------------------')
         if(this.props.popup===true && this.props.open===true && prevProps.open===false){
             this.props.onOpen?.bind(this)()
         }
@@ -75,17 +73,13 @@ export default class JRWindow extends JRFrame {
         return this.props.popup===true
             ?this.props.open===true
                 ?<StyledJRWindow
-                ref={this.ref}
-                className={`jr-window ${this.props.className??''}`}
-                $x={this.x}
-                $y={this.y}
-                $width={this.width}
-                $height={this.height}
-                $thick={this.thick}
-            // onMouseDown={()=>{
-                //     po('onFocus')
-                //     this.ref.current.style.zIndex=100
-                // }}
+                    ref={this.ref}
+                    className={`jr-window ${this.props.className??''}`}
+                    $x={this.x}
+                    $y={this.y}
+                    $width={this.width}
+                    $height={this.height}
+                    $thick={this.thick}
                 >
                     <main>
                         <TitleBar 

package/src/components/JRWindow/TitleBar.jsx

@@ -150,11 +150,11 @@ export default class TitleBar extends React.Component{
         >
             <FreeType tag='div' config={this.props.title??''} me={this.props.window} className={'title'}/>
             <nav>
-                <JRButton icon={<IconMinus />}/>
-                <JRButton icon={<IconSquare />}/>
+                <JRButton />
+                <JRButton />
                 {
                     this.props.window.props.setOpen
-                        ?<JRButton icon={<IconX />} 
+                        ?<JRButton 
                             className={'danger'}
                             onClick={()=>{
                                 this.props.window.props.setOpen(false)

package/src/index.js

@@ -3,7 +3,9 @@ import JRFrame from './components/JRFrame/JRFrame'
 import JRTable from './components/JRTable/JRTable'
 import JRFields from './components/JRFields/JRFields'
 import JRTestReact from './components/JRTest'
+import JRButton from './components/JRInput/JRButton'
 export {
     JRTestReact
     ,JRSubmit,JRFrame,JRTable,JRFields
+    ,JRButton
 }