diff --git a/app/soapbox/features/ui/components/better_column.js b/app/soapbox/features/ui/components/better_column.js
index 65f7dd1d8..9bcbf2783 100644
--- a/app/soapbox/features/ui/components/better_column.js
+++ b/app/soapbox/features/ui/components/better_column.js
@@ -1,11 +1,12 @@
import React from 'react';
import ColumnHeader from './column_header';
import PropTypes from 'prop-types';
+import Column from 'soapbox/components/column';
import ColumnBackButton from '../../../components/column_back_button_slim';
import DropdownMenu from 'soapbox/containers/dropdown_menu_container';
// Yes, there are 3 types of columns at this point, but this one is better, I swear
-export default class Column extends React.PureComponent {
+export default class BetterColumn extends React.PureComponent {
static propTypes = {
heading: PropTypes.string,
@@ -16,11 +17,11 @@ export default class Column extends React.PureComponent {
};
render() {
- const { heading, icon, children, active, menu } = this.props;
+ const { heading, icon, children, active, menu, ...rest } = this.props;
const columnHeaderId = heading && heading.replace(/ /g, '-');
return (
-
+
{heading && }
{menu && (
@@ -31,7 +32,7 @@ export default class Column extends React.PureComponent {
{children}
-
+
);
}
diff --git a/app/soapbox/features/ui/components/column.js b/app/soapbox/features/ui/components/column.js
index 4d4986cdc..19ad84a02 100644
--- a/app/soapbox/features/ui/components/column.js
+++ b/app/soapbox/features/ui/components/column.js
@@ -1,8 +1,9 @@
import React from 'react';
import ColumnHeader from './column_header';
import PropTypes from 'prop-types';
+import Column from 'soapbox/components/column';
-export default class Column extends React.PureComponent {
+export default class UIColumn extends React.PureComponent {
static propTypes = {
heading: PropTypes.string,
@@ -17,14 +18,14 @@ export default class Column extends React.PureComponent {
}
render() {
- const { heading, icon, children, active, showBackBtn } = this.props;
+ const { heading, icon, children, active, showBackBtn, ...rest } = this.props;
const columnHeaderId = heading && heading.replace(/ /g, '-');
return (
-
+
{heading && }
{children}
-
+
);
}
diff --git a/app/soapbox/features/ui/components/columns_area.js b/app/soapbox/features/ui/components/columns_area.js
index cc35321b2..57f1cd75f 100644
--- a/app/soapbox/features/ui/components/columns_area.js
+++ b/app/soapbox/features/ui/components/columns_area.js
@@ -30,7 +30,7 @@ class ColumnsArea extends ImmutablePureComponent {
-
diff --git a/app/soapbox/pages/admin_page.js b/app/soapbox/pages/admin_page.js
index a91d87461..09fa0d81a 100644
--- a/app/soapbox/pages/admin_page.js
+++ b/app/soapbox/pages/admin_page.js
@@ -27,7 +27,7 @@ class AdminPage extends ImmutablePureComponent {
-
diff --git a/app/soapbox/pages/default_page.js b/app/soapbox/pages/default_page.js
index 04cf5e439..9e5c7a2ab 100644
--- a/app/soapbox/pages/default_page.js
+++ b/app/soapbox/pages/default_page.js
@@ -45,7 +45,7 @@ class DefaultPage extends ImmutablePureComponent {
-
diff --git a/app/soapbox/pages/empty_page.js b/app/soapbox/pages/empty_page.js
index 7ba4da5d5..45a7f24d1 100644
--- a/app/soapbox/pages/empty_page.js
+++ b/app/soapbox/pages/empty_page.js
@@ -16,7 +16,7 @@ export default class DefaultPage extends ImmutablePureComponent {
-
diff --git a/app/soapbox/pages/group_page.js b/app/soapbox/pages/group_page.js
index 9458638b9..d4da40a3f 100644
--- a/app/soapbox/pages/group_page.js
+++ b/app/soapbox/pages/group_page.js
@@ -54,7 +54,7 @@ class GroupPage extends ImmutablePureComponent {
-
diff --git a/app/soapbox/pages/groups_page.js b/app/soapbox/pages/groups_page.js
index e38aaf52e..8d7683cb9 100644
--- a/app/soapbox/pages/groups_page.js
+++ b/app/soapbox/pages/groups_page.js
@@ -39,7 +39,7 @@ class GroupsPage extends ImmutablePureComponent {
-
diff --git a/app/soapbox/pages/home_page.js b/app/soapbox/pages/home_page.js
index da07687e4..882e98939 100644
--- a/app/soapbox/pages/home_page.js
+++ b/app/soapbox/pages/home_page.js
@@ -67,8 +67,8 @@ class HomePage extends ImmutablePureComponent {