revelry_core 0.1.8.4 → 0.1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42ec1c00de9937cd73a93a8748c222df247ac8fa
-  data.tar.gz: 3321b2e4c22dd9e9caa57d1b7e179870b6485513
+  metadata.gz: a324ec06106a98b91e552c5ab73cea21db1dfab7
+  data.tar.gz: 4d946a5cb3ad544904e748648b3aa5092c1f97fd
 SHA512:
-  metadata.gz: fcb91d9ed2709145914e5496f5e0f2737b78d922d56c05612fb6c9362b91a37a738b54a3d13d19310b65239dc16c235a629d8f6e3991741d5bbc43d3b4492e23
-  data.tar.gz: 99b39bd9b49ec7e12c8f38ba59ec1b07e9b3e357558540864775a11c63b44300d1efa8c3d02b8e9612eb2028213c9d24c7b8b4a8b93a1ef2f6e4c34b618e2241
+  metadata.gz: 68043e9e242c83d5f62f4229d06d236d26a7e3f990d1cfbfdda6cb3ccc3801ab71ccb72fccbd314fee1e7ddb4de3fe1168e8e792cf343be2ed92ec41ed75b189
+  data.tar.gz: a8c3a48ab36030a00b24358c9d8d27fc88e81efa1b60ced672fac0406865a5ac216a03f9852e967d8204fb438b6c95124413f3c44a6c71f7af23c18af1b9fc9e

data/app/assets/javascripts/revelry/examples/Tabs.js.cjsx

@@ -1,4 +1,4 @@
-Rev.pullInto(this) 'Lipsum', 'Tabs', 'TabBlock', 'TabsAccordion'
+Rev.pullInto(this) 'Lipsum', 'StatelessTabs', 'Tabs', 'TabBlock', 'TabsAccordion'
 
 Rev.registerExample 'Tabs & Such',
 
@@ -7,6 +7,20 @@ Rev.registerExample 'Tabs & Such',
 
   render: ->
     <div>
+      <h3>{"<StatelessTabs>"}</h3>
+      <p>
+        StatelessTabs takes its marching orders about what content to show from props.
+        This particular instance will default to the second tab.
+        On tab click, it will show an alert but not switch content.
+      </p>
+      <StatelessTabs activeKey="two" onChange={(e) -> alert "I refuse to change!"}>
+        <TabBlock key="one" tab={<a href="#">One</a>}>
+          <Lipsum />
+        </TabBlock>
+        <TabBlock key="two" tab={<a href="#">Two</a>}>
+          <Lipsum p=2 />
+        </TabBlock>
+      </StatelessTabs>
       <h3>{"<Tabs>"}</h3>
       <Tabs onChange={@onTabChange}>
         <TabBlock key="one" tab={<a href="#">One</a>}>

data/app/assets/javascripts/revelry/ui/tabs/Tabs.js.cjsx

@@ -1,26 +1,23 @@
-Rev.registerComponent 'Tabs',
+Rev.registerComponent 'StatelessTabs',
 
   getDefaultProps: ->
-    props =
-      onChange: () -> # noop
+    activeKey: null
+    onChange: () -> # noop
 
-  getActiveTab: ->
-    @state?.selectedKey || @props.activeKey || @getNormalizedChildren()[0]?.key
+  getActiveKey: -> @props.activeKey or @getNormalizedChildren()[0]?.key
 
   renderTab: (child) ->
-    key = child.key
     className = @classSet
-      active: key == @getActiveTab()
+      active: child.key == @getActiveKey()
       'RevTabs-tab': true
 
-    <dd key={key} className={className} onClick={@handleTabClick(child)}>
+    <dd key={child.key} className={className} onClick={@handleTabClick(child)}>
       {child.props.tab}
     </dd>
 
   renderContent: (child) ->
-    newProps =
-      key: child.key
-    newProps.active = true if child.key == @getActiveTab()
+    newProps = key: child.key
+    newProps.active = true if child.key == @getActiveKey()
     React.addons.cloneWithProps child, newProps
 
   render: ->
@@ -43,7 +40,24 @@ Rev.registerComponent 'Tabs',
   handleTabClick: (activeTab) -> (e) =>
     e.preventDefault()
     e.stopPropagation()
-    @setState
-      selectedKey: activeTab.key
     e.activeTab = activeTab
     @props.onChange(e)
+
+Rev.registerComponent 'Tabs',
+
+  getDefaultProps: ->
+    onChange: () -> # noop
+
+  getInitialState: ->
+    activeKey: null
+
+  render: ->
+    <Rev.Components.StatelessTabs
+      {...@props}
+      activeKey={@state.activeKey}
+      onChange={@handleChange}
+    />
+
+  handleChange: (e) ->
+    @setState activeKey: e.activeTab.key
+    @props.onChange e

data/app/assets/javascripts/revelry/ui/tabs/TabsAccordion.js.cjsx

@@ -1,27 +1,18 @@
-Rev.registerComponent 'TabsAccordion',
+Rev.registerComponent 'StatelessTabsAccordion',
 
   getDefaultProps: ->
-    props =
-      onChange: () -> # noop
-      activeKey: null
-
-  getInitialState: ->
-    children = @getNormalizedChildren()
-
-    activeTabKey = @props.activeKey
-    activeTabKey ||= children[0].key if children.length > 0
+    onChange: () -> # noop
+    activeKey: null
 
-    state =
-      activeTabKey: activeTabKey
+  getActiveKey: -> @props.activeKey or @getNormalizedChildren()[0]?.key
 
   render: ->
-    children = @getNormalizedChildren()
-    <ul className="RevAccordion accordion">{children.map @renderChild}</ul>
+    <ul className="RevAccordion accordion">
+      {@getNormalizedChildren().map @renderChild}
+    </ul>
 
   renderChild: (child) ->
-    key = child.key
-
-    active = key == @state.activeTabKey
+    active = child.key == @getActiveKey()
 
     className = @classSet
       "RevTabsAccordion": true
@@ -35,7 +26,7 @@ Rev.registerComponent 'TabsAccordion',
     content = React.addons.cloneWithProps child,
       active: active
 
-    <li key={key} className={className}>
+    <li key={child.key} className={className}>
       {tab}
       {content}
     </li>
@@ -43,7 +34,24 @@ Rev.registerComponent 'TabsAccordion',
   handleTabClick: (activeTab) -> (e) =>
     e.preventDefault()
     e.stopPropagation()
-    @setState
-      activeTabKey: activeTab.key
     e.activeTab = activeTab
     @props.onChange(e)
+
+Rev.registerComponent 'TabsAccordion',
+
+  getDefaultProps: ->
+    onChange: () -> # noop
+
+  getInitialState: ->
+    activeKey: null
+
+  render: ->
+    <Rev.Components.StatelessTabsAccordion
+      {...@props}
+      activeKey={@state.activeKey}
+      onChange={@handleChange}
+    />
+
+  handleChange: (e) ->
+    @setState activeKey: e.activeTab.key
+    @props.onChange e

data/lib/revelry_core/version.rb

@@ -1,5 +1,5 @@
 module Revelry
   module Core
-    VERSION = "0.1.8.4"
+    VERSION = "0.1.8.5"
   end
 end