Move Widgets::Base to Curses::React::Component

lib/curses/react/component.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+module Curses
+  module React
+    class Component
+      def initialize(parent)
+        @parent = parent
+        @props = {}.freeze
+      end
+
+      def props=(value)
+        raise TypeError,     "expected props to be a #{Hash}" unless value.is_a? Hash
+        raise ArgumentError, 'expected props to be frozen'    unless value.frozen?
+
+        @window = nil if props[:x] != value[:x] || props[:y] != value[:y] ||
+                         props[:width] != value[:width] || props[:height] != value[:height]
+
+        @props = value
+      end
+
+      def trigger(event); end
+
+      def render
+        draw
+        window.refresh
+      end
+
+    private
+
+      attr_reader :parent, :props
+
+      def window
+        @window ||= parent&.subwin(props[:x], props[:y], props[:width], props[:height]) || Curses.stdscr
+      end
+
+      def draw
+        raise NotImplementedError, "#{self.class}#draw"
+      end
+
+      def setpos(x, y)
+        window.setpos y, x
+      end
+
+      def addstr(s)
+        window.addstr s
+      end
+    end
+  end
+end

lib/screen.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 require 'curses'
+require 'curses/react/component'
 
 # Additional classes
 require 'events'
 require 'style'
 
 # Basic
-require 'widgets/base'
 require 'widgets/text'
 
 # Basic containers

lib/widgets/base.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-module Widgets
-  class Base
-    def initialize(parent)
-      @parent = parent
-      @props = {}.freeze
-    end
-
-    def props=(value)
-      raise TypeError,     "expected props to be a #{Hash}" unless value.is_a? Hash
-      raise ArgumentError, 'expected props to be frozen'    unless value.frozen?
-
-      @window = nil if props[:x] != value[:x] || props[:y] != value[:y] ||
-                       props[:width] != value[:width] || props[:height] != value[:height]
-
-      @props = value
-    end
-
-    def trigger(event); end
-
-    def render
-      draw
-      window.refresh
-    end
-
-  private
-
-    attr_reader :parent, :props
-
-    def window
-      @window ||= parent&.subwin(props[:x], props[:y], props[:width], props[:height]) || Curses.stdscr
-    end
-
-    def draw
-      raise NotImplementedError, "#{self.class}#draw"
-    end
-
-    def setpos(x, y)
-      window.setpos y, x
-    end
-
-    def addstr(s)
-      window.addstr s
-    end
-  end
-end

lib/widgets/chat/history.rb

@@ -2,7 +2,7 @@
 
 module Widgets
   class Chat < VPanel
-    class History < Base
+    class History < Curses::React::Component
     private
 
       def draw

lib/widgets/chat/info.rb

@@ -4,7 +4,7 @@ module Widgets
   using Helpers
 
   class Chat < VPanel
-    class Info < Base
+    class Info < Curses::React::Component
       PUBLIC_KEY_LABEL = 'Public key: '
 
     private

lib/widgets/container.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Widgets
-  class Container < Base
+  class Container < Curses::React::Component
     def subwin(x, y, width, height)
       window.subwin height, width, y, x
     end

lib/widgets/logo.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Widgets
-  class Logo < Base
+  class Logo < Curses::React::Component
     LOGO = [
       '  _____ ___ _  _ ___  _   _  ',
       ' |_   _/ _ \ \/ / _ \| \ | | ',

lib/widgets/menu.rb

@@ -3,7 +3,7 @@
 module Widgets
   using Helpers
 
-  class Menu < Base
+  class Menu < Curses::React::Component
     def trigger(event)
       case event
       when Events::Text::Up

lib/widgets/text.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Widgets
-  class Text < Base
+  class Text < Curses::React::Component
     def trigger(event)
       case event
       when Events::Text::Enter