Fix clipboard regression instroduced by aframevr#638, resolve the col…

…lapsible behavior in another way
vincentfretin · Dec 24, 2022 · 1666568 · 1666568
1 parent 24b9a72
commit 1666568
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/src/components/Collapsible.js b/src/components/Collapsible.js
@@ -22,7 +22,9 @@ export default class Collapsible extends React.Component {
     };
   }
 
-  toggleVisibility = () => {
+  toggleVisibility = (event) => {
+    // Don't collapse if we click on actions like clipboard
+    if (event.target.nodeName === 'A') return;
     this.setState({ collapsed: !this.state.collapsed });
     if (typeof ga !== 'undefined') {
       ga('send', 'event', 'Components', 'collapse');

diff --git a/src/components/components/CommonComponents.js b/src/components/components/CommonComponents.js
@@ -115,14 +115,9 @@ export default class CommonComponents extends React.Component {
           <img src={GLTFIcon} />
         </a>
         <a
-          href="#"
           title="Copy entity HTML to clipboard"
           data-action="copy-entity-to-clipboard"
           className="button fa fa-clipboard"
-          onClick={(event) => {
-            event.preventDefault();
-            event.stopPropagation();
-          }}
         />
       </div>
     );

diff --git a/src/components/components/Component.js b/src/components/components/Component.js
@@ -153,11 +153,6 @@ export default class Component extends React.Component {
               data-action="copy-component-to-clipboard"
               data-component={subComponentName || componentName}
               className="button fa fa-clipboard"
-              href="#"
-              onClick={(event) => {
-                event.preventDefault();
-                event.stopPropagation();
-              }}
             />
             <a
               title="Remove component"