Improvements and fixes for React & Redux snippets

snippets/rjsx-mode/.yas-setup.el

@@ -0,0 +1,21 @@
+;;; .yas-setup.el --- Yasnippet helper functions for JSX snippets
+
+;;; Commentary:
+
+;;; Code:
+
+(require 'yasnippet)
+(require 's)
+
+(defun yas-jsx-get-class-name-by-file-name ()
+  "Return name of class-like construct by `file-name'."
+  (if buffer-file-name
+      (let ((class-name (file-name-nondirectory
+                         (file-name-sans-extension buffer-file-name))))
+        (if (equal class-name "index")
+            (file-name-nondirectory
+             (directory-file-name (file-name-directory buffer-file-name)))
+          class-name))
+    ""))
+
+;;; .yas-setup.el ends here

snippets/rjsx-mode/React-Native/rnc

@@ -8,11 +8,11 @@
 import React, { Component } from 'react'
 import { Text, View } from 'react-native'
 
-export default class ${1:${TM_FILENAME_BASE}} extends Component {
+export default class ${1:`(yas-jsx-get-class-name-by-file-name)`} extends Component {
   render() {
     return (
       <View>
-        <Text> ${2:textInComponent} </Text>
+        <Text>${2:textInComponent}</Text>
       </View>
     )
   }

snippets/rjsx-mode/React-Native/rnce

@@ -8,14 +8,14 @@
 import React, { Component } from 'react'
 import { Text, View } from 'react-native'
 
-export class ${1:${TM_FILENAME_BASE}} extends Component {
+export class ${1:`(yas-jsx-get-class-name-by-file-name)`} extends Component {
   render() {
     return (
       <View>
-        <Text> ${2:textInComponent} </Text>
+        <Text>${2:textInComponent}</Text>
       </View>
     )
   }
 }
 
-export default ${1:${TM_FILENAME_BASE}}
+export default $1

snippets/rjsx-mode/React-Native/rncs

@@ -8,11 +8,11 @@
 import React, { Component } from 'react'
 import { Text, StyleSheet, View } from 'react-native'
 
-export default class ${1:${TM_FILENAME_BASE}} extends Component {
+export default class ${1:`(yas-jsx-get-class-name-by-file-name)`} extends Component {
   render() {
     return (
       <View>
-        <Text> ${2:textInComponent} </Text>
+        <Text>${2:textInComponent}</Text>
       </View>
     )
   }

snippets/rjsx-mode/React-Native/rnpc

@@ -8,11 +8,11 @@
 import React, { PureComponent } from 'react'
 import { Text, View } from 'react-native'
 
-export default class ${1:${TM_FILENAME_BASE}} extends PureComponent {
+export default class ${1:`(yas-jsx-get-class-name-by-file-name)`} extends PureComponent {
   render() {
     return (
       <View>
-        <Text> ${2:textInComponent} </Text>
+        <Text>${2:textInComponent}</Text>
       </View>
     )
   }

snippets/rjsx-mode/React-Native/rnpce

@@ -8,14 +8,14 @@
 import React, { PureComponent } from 'react'
 import { Text, View } from 'react-native'
 
-export class ${1:${TM_FILENAME_BASE}} extends PureComponent {
+export class ${1:`(yas-jsx-get-class-name-by-file-name)`} extends PureComponent {
   render() {
     return (
       <View>
-        <Text> ${2:textInComponent} </Text>
+        <Text>${2:textInComponent}</Text>
       </View>
     )
   }
 }
 
-export default ${1:${TM_FILENAME_BASE}}
+export default $1

snippets/rjsx-mode/React/cdm

@@ -5,6 +5,6 @@
 # key: cdm
 # --
 
-componentDidMount = () => {
+componentDidMount() {
   $0
 }

snippets/rjsx-mode/React/cdup

@@ -5,6 +5,6 @@
 # key: cdup
 # --
 
-componentDidUpdate = (prevProps, prevState) => {
+componentDidUpdate(prevProps, prevState, snapshot) {
   $0
 }

snippets/rjsx-mode/React/cwun

@@ -5,6 +5,6 @@
 # key: cwun
 # --
 
-componentWillUnmount = () => {
+componentWillUnmount() {
   $0
 }

snippets/rjsx-mode/React/gdsfp

@@ -5,6 +5,6 @@
 # key: gdsfp
 # --
 
-static getDerivedStateFromProps(props, state) {
-  ${1}
+static getDerivedStateFromProps(nextProps, prevState) {
+  $0
 }

snippets/rjsx-mode/React/gsbu

@@ -5,6 +5,6 @@
 # key: gsbu
 # --
 
-getSnapshotBeforeUpdate = (prevProps, prevState) => {
+getSnapshotBeforeUpdate(prevProps, prevState) {
   $0
 }

snippets/rjsx-mode/React/rafc

@@ -7,12 +7,12 @@
 
 import React from 'react'
 
-const ${1:${TM_FILENAME_BASE}} = () => {
+const ${1:`(yas-jsx-get-class-name-by-file-name)`} = (props) => {
   return (
     <div>
       $0
     </div>
   )
 }
 
-export default ${1:${TM_FILENAME_BASE}}
+export default $1

snippets/rjsx-mode/React/rafce

@@ -7,12 +7,12 @@
 
 import React from 'react'
 
-const ${1:${TM_FILENAME_BASE}} = () => {
+const ${1:`(yas-jsx-get-class-name-by-file-name)`} = (props) => {
   return (
     <div>
       $0
     </div>
   )
 }
 
-export default ${1:${TM_FILENAME_BASE}}
+export default $1

snippets/rjsx-mode/React/rafcp

@@ -8,16 +8,16 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-const ${1:${TM_FILENAME_BASE}} = props => {
+const ${1:`(yas-jsx-get-class-name-by-file-name)`} = (props) => {
   return (
     <div>
       $0
     </div>
   )
 }
 
-${1:${TM_FILENAME_BASE}}.propTypes = {
+$1.propTypes = {
 
 }
 
-export default ${1:${TM_FILENAME_BASE}}
+export default $1

snippets/rjsx-mode/React/rcc

@@ -7,7 +7,7 @@
 
 import React, { Component } from 'react'
 
-export default class ${1:${TM_FILENAME_BASE}} extends Component {
+export default class ${1:`(yas-jsx-get-class-name-by-file-name)`} extends Component {
   render() {
     return (
       <div>

snippets/rjsx-mode/React/rccp

@@ -8,7 +8,7 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 
-export default class ${1:${TM_FILENAME_BASE}} extends Component {
+export default class ${1:`(yas-jsx-get-class-name-by-file-name)`} extends Component {
   static propTypes = {
     ${2:prop}: ${3:PropTypes}
   }

snippets/rjsx-mode/React/rce

@@ -7,7 +7,7 @@
 
 import React, { Component } from 'react'
 
-export class ${1:${TM_FILENAME_BASE}} extends Component {
+export class ${1:`(yas-jsx-get-class-name-by-file-name)`} extends Component {
   render() {
     return (
       <div>
@@ -17,4 +17,4 @@ export class ${1:${TM_FILENAME_BASE}} extends Component {
   }
 }
 
-export default ${1:${TM_FILENAME_BASE}}
+export default $1

snippets/rjsx-mode/React/rcep

@@ -8,7 +8,7 @@
 import React, { Component } from 'react'
 import PropTypes from 'prop-types'
 
-export class ${1:${TM_FILENAME_BASE}} extends Component {
+export class ${1:`(yas-jsx-get-class-name-by-file-name)`} extends Component {
   static propTypes = {
 
   }
@@ -22,4 +22,4 @@ export class ${1:${TM_FILENAME_BASE}} extends Component {
   }
 }
 
-export default ${1:${TM_FILENAME_BASE}}
+export default $1

snippets/rjsx-mode/React/rmc

@@ -7,10 +7,8 @@
 
 import React, { memo } from 'react'
 
-export default memo(function ${1:${TM_FILENAME_BASE}}() {
-  return (
-    <div>
-      $0
-    </div>
-  )
-})
+export default memo((props) => (
+  <div>
+    $0
+  </div>
+))