amotify 0.0.59 → 0.0.62

package/src/functions/Table/Drag/parts.tsx

@@ -1,23 +1,23 @@
 import {
   useStore,
   React
-} from '@global';
+} from '@global'
 import {
   FAI
-} from '@atoms';
+} from '@atoms'
 import {
   Buttons,
   Tooltips,
-} from '@fn';
+} from '@fn'
 
 import {
   Comps,
   DefaultCellSystemStyles
-} from '../_';
+} from '../_'
 
-import { faGripVertical } from '@fortawesome/free-solid-svg-icons/faGripVertical';
+import { faGripVertical } from '@fortawesome/free-solid-svg-icons/faGripVertical'
 
-import style from '../style.module.scss';
+import style from '../style.module.scss'
 
 const HeadRow: React.FC<amotify.fn.Tables.Drag.Params> = ( props ) => {
   let {
@@ -27,16 +27,16 @@ const HeadRow: React.FC<amotify.fn.Tables.Drag.Params> = ( props ) => {
     colLength,
     head,
     rows
-  } = props;
+  } = props
 
-  if ( !head ) return null;
+  if ( !head ) return null
 
-  let Cols = [];
+  let Cols = []
 
   for ( let colIndex = 0; colIndex < colLength; colIndex++ ) {
-    let col = head[ colIndex ];
+    let col = head[ colIndex ]
 
-    let Cell = Comps[ col.type == 'th' ? 'TH' : 'TD' ];
+    let Cell = Comps[ col.type == 'th' ? 'TH' : 'TD' ]
     Cols.push( <Cell
       { ...cellStyles }
       { ...DefaultCellSystemStyles( {
@@ -61,13 +61,13 @@ const HeadRow: React.FC<amotify.fn.Tables.Drag.Params> = ( props ) => {
         col.className,
       ].join( ' ' ) }
       { ...col }
-    /> );
+    /> )
   }
 
   return <Comps.Row
     className={ [ style.Row,style.HeadRow ].join( ' ' ) }
     children={ Cols }
-  />;
+  />
 }
 const BodyRows: React.FC<amotify.fn.Tables.Drag.Params> = ( props ) => {
   let {
@@ -78,19 +78,19 @@ const BodyRows: React.FC<amotify.fn.Tables.Drag.Params> = ( props ) => {
     rows,
     colLength,
     onOrderChanged
-  } = props;
+  } = props
 
-  let [ val_componentID ] = React.useState( $.uuidGen() );
+  let [ val_componentID ] = React.useState( $.uuidGen() )
   let [ val_info,set_info ] = React.useState( {
     rows: rows,
     origin: 0,
     to: NaN
-  } );
+  } )
 
-  let BodyRows: ReactElement[] = [];
+  let BodyRows: ReactElement[] = []
 
   val_info.rows.forEach( ( cols,rowIndex ) => {
-    let Cols: ReactElement[] = [];
+    let Cols: ReactElement[] = []
     {
       Cols.push( <Comps.TH
         key={ 'DragOrigin' }
@@ -132,7 +132,7 @@ const BodyRows: React.FC<amotify.fn.Tables.Drag.Params> = ( props ) => {
               index: rowIndex,
               rows: val_info.rows,
               maxLength: rows.length
-            } );
+            } )
           } }
           onTouchStart={ ( event ) => {
             EffectStart( event,{
@@ -140,18 +140,18 @@ const BodyRows: React.FC<amotify.fn.Tables.Drag.Params> = ( props ) => {
               index: rowIndex,
               rows: val_info.rows,
               maxLength: rows.length
-            } );
+            } )
           } }
         >
           <FAI icon={ faGripVertical } />
         </Buttons.Button.Clear.R>
-      </Comps.TH> );
+      </Comps.TH> )
     }
 
     cols.forEach( ( col,colIndex ) => {
       col = { ...col as any }
 
-      let Cell = Comps[ col.type == 'th' ? 'TH' : 'TD' ];
+      let Cell = Comps[ col.type == 'th' ? 'TH' : 'TD' ]
       Cols.push( <Cell
         { ...cellStyles }
         { ...DefaultCellSystemStyles( {
@@ -176,8 +176,8 @@ const BodyRows: React.FC<amotify.fn.Tables.Drag.Params> = ( props ) => {
           col.className,
         ].join( ' ' ) }
         { ...col }
-      /> );
-    } );
+      /> )
+    } )
 
     BodyRows.push( <Comps.Row
       key={ rowIndex }
@@ -185,15 +185,15 @@ const BodyRows: React.FC<amotify.fn.Tables.Drag.Params> = ( props ) => {
       data-rowId={ rowIndex }
       className={ [ style.Row,style.BodyRow ].join( ' ' ) }
       children={ Cols }
-    /> );
-  } );
+    /> )
+  } )
 
   if ( !isNaN( val_info.to ) ) {
     let {
       origin,
       to
-    } = val_info;
-    let Cols = [];
+    } = val_info
+    let Cols = []
     Cols.push( <Comps.TH
       key={ 'dragButton' }
       backgroundColor='tcOpLow'
@@ -208,13 +208,13 @@ const BodyRows: React.FC<amotify.fn.Tables.Drag.Params> = ( props ) => {
       <FAI.ArrowRight
         fontColor='theme'
       />
-    </Comps.TH> );
+    </Comps.TH> )
 
-    let cols = val_info.rows[ origin ];
+    let cols = val_info.rows[ origin ]
     cols.forEach( ( col,colIndex ) => {
       col = { ...col as any }
 
-      let Cell = Comps[ col.type == 'th' ? 'TH' : 'TD' ];
+      let Cell = Comps[ col.type == 'th' ? 'TH' : 'TD' ]
       Cols.push( <Cell
         { ...cellStyles }
         { ...DefaultCellSystemStyles( {
@@ -240,8 +240,8 @@ const BodyRows: React.FC<amotify.fn.Tables.Drag.Params> = ( props ) => {
         ].join( ' ' ) }
         backgroundColor='tcOpLow'
         { ...col }
-      /> );
-    } );
+      /> )
+    } )
 
     BodyRows.splice( to,0,<Comps.Row
       key={ 'preSet' }
@@ -256,19 +256,19 @@ const BodyRows: React.FC<amotify.fn.Tables.Drag.Params> = ( props ) => {
       value: {
         swap: ( rowIndex: number,insertIndex: number ) => {
           if ( insertIndex || insertIndex == 0 ) {
-            let targetRow = val_info.rows[ rowIndex ];
+            let targetRow = val_info.rows[ rowIndex ]
 
-            let newRows = [ ...val_info.rows ];
-            newRows.splice( rowIndex,1 );
-            newRows.splice( insertIndex - ( rowIndex < insertIndex ? 1 : 0 ),0,targetRow );
+            let newRows = [ ...val_info.rows ]
+            newRows.splice( rowIndex,1 )
+            newRows.splice( insertIndex - ( rowIndex < insertIndex ? 1 : 0 ),0,targetRow )
 
             set_info( {
               rows: newRows,
               origin: 0,
               to: NaN
-            } );
+            } )
 
-            onOrderChanged( newRows.map( ( row ) => JSON.parse( row.rowID ) ) );
+            onOrderChanged( newRows.map( ( row ) => JSON.parse( row.rowID ) ) )
           }
         },
         preSet: ( props: {
@@ -277,31 +277,31 @@ const BodyRows: React.FC<amotify.fn.Tables.Drag.Params> = ( props ) => {
         } ) => {
           let {
             origin,index
-          } = props;
+          } = props
 
           set_info( {
             rows: val_info.rows,
             origin: origin,
             to: index
-          } );
+          } )
         }
       }
     } )
-  } );
+  } )
   React.useEffect( () => {
     return () => {
-      useStore.delete( val_componentID );
+      useStore.delete( val_componentID )
     }
-  },[] );
+  },[] )
 
   return <>
     { BodyRows }
-  </>;
+  </>
 }
 
 export const DragTable: React.FC<amotify.fn.Tables.Drag.Params> = ( params ) => {
-  params = { ...params };
-  params.colLength = params.colLength + 1;
+  params = { ...params }
+  params.colLength = params.colLength + 1
 
   if ( params.head ) {
     params.head = [
@@ -317,7 +317,7 @@ export const DragTable: React.FC<amotify.fn.Tables.Drag.Params> = ( params ) =>
                 <FAI icon={ faGripVertical } />
                 ボタンをドラッグして順序を変更
               </Tooltips.Comps.Body>
-            } );
+            } )
           } }
         >
           <FAI.QuestionCircle />
@@ -326,17 +326,17 @@ export const DragTable: React.FC<amotify.fn.Tables.Drag.Params> = ( params ) =>
         unitWidth: 4
       },
       ...params.head
-    ];
+    ]
   }
   params.rows = params.rows.map( ( row,rowIndex ) => {
-    row.rowID = JSON.stringify( row.rowID || rowIndex );
-    return row;
-  } );
+    row.rowID = JSON.stringify( row.rowID || rowIndex )
+    return row
+  } )
 
   return <Comps.Table className={ style.Table }>
     <HeadRow { ...params } />
     <BodyRows { ...params } />
-  </Comps.Table>;
+  </Comps.Table>
 }
 
 type InfoParams = {
@@ -348,17 +348,17 @@ type InfoParams = {
 }
 
 const EffectStart = async function ( event: any,info: InfoParams ) {
-  event.stopPropagation();
-  event.preventDefault();
+  event.stopPropagation()
+  event.preventDefault()
 
   let {
     id,
     index,
     rows,
     maxLength
-  } = info;
+  } = info
 
-  $( '#TableRow-' + id + '-' + index ).addClass( style.DraggerOrigin );
+  $( '#TableRow-' + id + '-' + index ).addClass( style.DraggerOrigin )
 
   $( document )
     .addEvent( {
@@ -382,30 +382,30 @@ const EffectStart = async function ( event: any,info: InfoParams ) {
       eventID: 'DragTouchEnd',
       eventType: 'touchend',
       callback: ( event ) => { EffectEnd( event,info ) }
-    } );
+    } )
 }
 const EffectMove = function ( event: any,info: InfoParams ) {
   let {
     id,
     maxLength
-  } = info;
+  } = info
 
-  let Y = $.getCursor( event ).y - $.getScreenSize().scrollY;
+  let Y = $.getCursor( event ).y - $.getScreenSize().scrollY
 
   for ( let rowIndex = 0; rowIndex < maxLength; rowIndex++ ) {
-    let Row = $( '#TableRow-' + id + '-' + rowIndex );
+    let Row = $( '#TableRow-' + id + '-' + rowIndex )
     let {
       top: rT,
       bottom: rB,
       height: rH
-    } = Row.position();
+    } = Row.position()
 
     if ( rowIndex == 0 && Y < rT ) {
-      info.insertIndex = 0;
+      info.insertIndex = 0
     } else if ( rowIndex === maxLength - 1 && rB <= Y ) {
-      info.insertIndex = maxLength;
+      info.insertIndex = maxLength
     } else if ( Y >= rT && Y < rB ) {
-      info.insertIndex = rowIndex + 1;
+      info.insertIndex = rowIndex + 1
     }
   }
 
@@ -413,30 +413,30 @@ const EffectMove = function ( event: any,info: InfoParams ) {
     let {
       index,
       insertIndex
-    } = info;
+    } = info
 
-    let component = useStore.get( id );
+    let component = useStore.get( id )
     if ( component && component.preSet ) component.preSet( {
       origin: index,
       index: insertIndex
-    } );
+    } )
   }
 
-  event.stopPropagation();
-  event.preventDefault();
-  return false;
+  event.stopPropagation()
+  event.preventDefault()
+  return false
 }
 const EffectEnd = function ( event: any,info: InfoParams ) {
   let {
     id,
     index,
     insertIndex
-  } = info;
+  } = info
 
-  let component = useStore.get( id );
-  if ( component && component.swap ) component.swap( index,insertIndex );
+  let component = useStore.get( id )
+  if ( component && component.swap ) component.swap( index,insertIndex )
 
-  $( '#TableRow-' + id + '-' + index ).removeClass( style.DraggerOrigin );
+  $( '#TableRow-' + id + '-' + index ).removeClass( style.DraggerOrigin )
 
-  $( document ).removeEvent( [ 'DragMouseMove','DragTouchMove','DragMouseUp','DragTouchEnd' ] );
+  $( document ).removeEvent( [ 'DragMouseMove','DragTouchMove','DragMouseUp','DragTouchEnd' ] )
 }

package/src/functions/Table/Normal/parts.tsx

@@ -1,9 +1,9 @@
-import React from 'react';
+import React from 'react'
 import {
   Comps,
   DefaultCellSystemStyles
-} from '../_';
-import style from '../style.module.scss';
+} from '../_'
+import style from '../style.module.scss'
 
 const HeadRow: React.FC<amotify.fn.Tables.Normal.Params> = ( params ) => {
   let {
@@ -13,13 +13,13 @@ const HeadRow: React.FC<amotify.fn.Tables.Normal.Params> = ( params ) => {
     colLength,
     head,
     rows
-  } = params;
+  } = params
 
-  if ( !head ) return null;
+  if ( !head ) return null
 
-  let Cols: ReactElement[] = [];
+  let Cols: ReactElement[] = []
   head.forEach( ( col,colIndex ) => {
-    let Cell = Comps[ col.type == 'th' ? 'TH' : 'TD' ];
+    let Cell = Comps[ col.type == 'th' ? 'TH' : 'TD' ]
     Cols.push( <Cell
       { ...cellStyles }
       { ...DefaultCellSystemStyles( {
@@ -44,13 +44,13 @@ const HeadRow: React.FC<amotify.fn.Tables.Normal.Params> = ( params ) => {
         col.className,
       ].join( ' ' ) }
       { ...col }
-    /> );
+    /> )
   } )
 
   return <Comps.Row
     className={ [ style.Row,style.HeadRow ].join( ' ' ) }
     children={ Cols }
-  />;
+  />
 }
 const BodyRows: React.FC<amotify.fn.Tables.Normal.Params> = ( params ) => {
   let {
@@ -61,13 +61,13 @@ const BodyRows: React.FC<amotify.fn.Tables.Normal.Params> = ( params ) => {
     rows,
     colLength,
     onRowClick,
-  } = params;
+  } = params
 
-  let BodyRows: ReactElement[] = [];
+  let BodyRows: ReactElement[] = []
   rows.forEach( ( cols,rowIndex ) => {
-    let Cols: ReactElement[] = [];
+    let Cols: ReactElement[] = []
     cols.forEach( ( col,colIndex ) => {
-      let Cell = Comps[ col.type == 'th' ? 'TH' : 'TD' ];
+      let Cell = Comps[ col.type == 'th' ? 'TH' : 'TD' ]
       Cols.push( <Cell
         { ...cellStyles }
         { ...DefaultCellSystemStyles( {
@@ -92,33 +92,33 @@ const BodyRows: React.FC<amotify.fn.Tables.Normal.Params> = ( params ) => {
           col.className,
         ].join( ' ' ) }
         { ...col }
-      /> );
-    } );
+      /> )
+    } )
 
     BodyRows.push( <Comps.Row
       key={ rowIndex }
       className={ [ style.Row,style.BodyRow ].join( ' ' ) }
       children={ Cols }
       onClick={ ( event ) => {
-        if ( onRowClick ) onRowClick( cols.rowID as any,event );
+        if ( onRowClick ) onRowClick( cols.rowID as any,event )
       } }
-    /> );
-  } );
+    /> )
+  } )
 
   return <>
     { BodyRows }
-  </>;
+  </>
 }
 
 export const NormalTable: React.FC<amotify.fn.Tables.Normal.Params> = ( params ) => {
   params = { ...params }
   params.rows = params.rows.map( ( row,rowIndex ) => {
-    row.rowID = row.rowID || rowIndex;
-    return row;
-  } );
+    row.rowID = row.rowID || rowIndex
+    return row
+  } )
 
   return <Comps.Table className={ style.Table }>
     <HeadRow { ...params } />
     <BodyRows { ...params } />
-  </Comps.Table>;
+  </Comps.Table>
 }

package/src/functions/Table/_.tsx

@@ -1,20 +1,20 @@
 import {
   StyleConverter,
   React
-} from '@global';
+} from '@global'
 
 import {
   Box,
   FAI
-} from '@atoms';
+} from '@atoms'
 
 export const Comps: amotify.fn.Tables.CompsMethods = {
   Table: ( params ) => {
-    let Params = StyleConverter.ToClassName( params );
+    let Params = StyleConverter.ToClassName( params )
     return <table
       { ...Params }
       border={ Params.border as any }
-    />;
+    />
   },
   Head: ( params ) => ( <thead { ...StyleConverter.ToClassName( params ) } /> ),
   Body: ( params ) => ( <tbody { ...StyleConverter.ToClassName( params ) } /> ),
@@ -34,15 +34,15 @@ export const Comps: amotify.fn.Tables.CompsMethods = {
   }
 }
 
-import { NormalTable } from './Normal/parts';
+import { NormalTable } from './Normal/parts'
 import {
   DataTable,
   DataFNs,
   DataComps
-} from './Data/parts';
-import { DragTable } from './Drag/parts';
+} from './Data/parts'
+import { DragTable } from './Drag/parts'
 
-import style from './style.module.scss';
+import style from './style.module.scss'
 
 const Wrapper: React.FC<amotify.fn.Tables.Uni.Params & {
   type: amotify.fn.Tables.Types
@@ -50,16 +50,16 @@ const Wrapper: React.FC<amotify.fn.Tables.Uni.Params & {
   let {
     tone,
     type,
-  } = params;
+  } = params
   params = { ...params }
-  params.tableID = params.tableID || $.uuidGen();
-  tone = tone || 'auto';
+  params.tableID = params.tableID || $.uuidGen()
+  tone = tone || 'auto'
 
   if ( tone == 'auto' ) {
     if ( type == 'drag' ) {
-      tone = 'rowBorder';
+      tone = 'rowBorder'
     } else {
-      tone = 'border';
+      tone = 'border'
     }
   }
 
@@ -84,37 +84,37 @@ const Wrapper: React.FC<amotify.fn.Tables.Uni.Params & {
     className,
     style: freeCSS,
     ...others
-  } = StyleConverter.ToClassName( Params as any );
+  } = StyleConverter.ToClassName( Params as any )
 
   let ClassName = [
     className,
     style.Wrap,
     style[ 'TableType_' + type ],
     style[ 'RowClickable_' + !!( params as any ).onRowClick ]
-  ].join( ' ' );
+  ].join( ' ' )
 
   let TableComponent = {
     'normal': NormalTable,
     'data': DataTable,
     'drag': DragTable,
     'spread': ''
-  }[ type ];
+  }[ type ]
 
   return <Box
     className={ ClassName }
     style={ freeCSS }
   >
     <TableComponent { ...others as any } />
-  </Box>;
+  </Box>
 }
 
-let DataComponent: any = ( props: any ) => ( <Wrapper type='data' { ...props } /> );
+let DataComponent: any = ( props: any ) => ( <Wrapper type='data' { ...props } /> )
 Object.entries( DataFNs ).forEach( ( [ key,value ] ) => {
-  DataComponent[ key ] = value;
-} );
+  DataComponent[ key ] = value
+} )
 Object.entries( DataComps ).forEach( ( [ key,value ] ) => {
-  DataComponent[ key ] = value;
-} );
+  DataComponent[ key ] = value
+} )
 
 export const Table: amotify.fn.Tables.Methods = {
   Normal: ( props ) => ( <Wrapper type='normal' { ...props } /> ),
@@ -130,18 +130,18 @@ export const DefaultCellStyles = ( type: amotify.fn.Tables.Types,tone: amotify.f
 
   let Styles: amotifyUniStyleParams = {}
   if ( type == 'drag' ) {
-    Styles.padding = 1;
+    Styles.padding = 1
   }
 
   if ( [ 'border','rowBorder','cellBorder' ].includes( tone ) ) {
-    Styles.borderBottom = '2.normal';
+    Styles.borderBottom = '2.normal'
   }
 
   if ( [ 'border','cellBorder' ].includes( tone ) ) {
-    Styles.borderRight = '2.normal';
+    Styles.borderRight = '2.normal'
   }
 
-  return Styles;
+  return Styles
 }
 
 export const DefaultCellSystemStyles = ( args: {
@@ -152,26 +152,26 @@ export const DefaultCellSystemStyles = ( args: {
 } ) => {
   let Styles: amotifyUniStyleParams = {}
   if ( args.right ) {
-    Styles.borderRight = 'unset';
+    Styles.borderRight = 'unset'
   }
 
   if ( args.top ) {
     if ( args.left ) {
-      Styles.borderTopLeftRadius = 'inherit';
+      Styles.borderTopLeftRadius = 'inherit'
     }
     if ( args.right ) {
-      Styles.borderTopRightRadius = 'inherit';
+      Styles.borderTopRightRadius = 'inherit'
     }
   }
   if ( args.bottom ) {
-    Styles.borderBottom = 'unset';
+    Styles.borderBottom = 'unset'
     if ( args.left ) {
-      Styles.borderBottomLeftRadius = 'inherit';
+      Styles.borderBottomLeftRadius = 'inherit'
     }
     if ( args.right ) {
-      Styles.borderBottomRightRadius = 'inherit';
+      Styles.borderBottomRightRadius = 'inherit'
     }
   }
 
-  return Styles;
+  return Styles
 }

package/src/functions/Tooltips/parts.tsx

@@ -1,10 +1,10 @@
-import React from 'react';
+import React from 'react'
 import {
   Box
-} from '@atoms';
+} from '@atoms'
 import {
   Sheet
-} from '@fn';
+} from '@fn'
 
 const Tooltips: amotify.fn.Tooltips.Methods = {
   __memoryID: $.uuidGen(),
@@ -13,7 +13,7 @@ const Tooltips: amotify.fn.Tooltips.Methods = {
       tipsID = $.uuidGen(),
       tipsGroups = [],
       ...sheetParams
-    } = params;
+    } = params
 
     Sheet.open( {
       sheetID: tipsID!,
@@ -30,13 +30,13 @@ const Tooltips: amotify.fn.Tooltips.Methods = {
       },
       type: 'custom',
       ...sheetParams
-    } );
+    } )
   },
   close: ( tipsID ) => {
-    Sheet.close( tipsID );
+    Sheet.close( tipsID )
   },
   closeALL: () => {
-    Sheet.closeGroup( 'tooltips' );
+    Sheet.closeGroup( 'tooltips' )
   },
   Comps: {
     Body: ( params ) => ( <Box