From 5d4b193865460bde65e0523a2a9c9c8425c5dc48 Mon Sep 17 00:00:00 2001 From: Laurent Nguyen Date: Wed, 14 Apr 2021 20:21:11 +0200 Subject: [PATCH] Fix Markdown Source style to show editor (#674) --- package-lock.json | 20 +++++++++---------- .../NotebookRenderer/markdown-cell.tsx | 9 ++++++++- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index f4f860b9c..8c72a7eb9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7237,14 +7237,6 @@ "optional": true, "requires": { "file-uri-to-path": "1.0.0" - }, - "dependencies": { - "file-uri-to-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", - "optional": true - } } }, "bintrees": { @@ -7918,9 +7910,9 @@ } }, "fsevents": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.1.tgz", - "integrity": "sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", "dev": true, "optional": true }, @@ -11072,6 +11064,12 @@ "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.5.tgz", "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==" }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "optional": true + }, "filesize": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz", diff --git a/src/Explorer/Notebook/NotebookRenderer/markdown-cell.tsx b/src/Explorer/Notebook/NotebookRenderer/markdown-cell.tsx index 1d6e898a7..9971cc802 100644 --- a/src/Explorer/Notebook/NotebookRenderer/markdown-cell.tsx +++ b/src/Explorer/Notebook/NotebookRenderer/markdown-cell.tsx @@ -7,12 +7,13 @@ import { ImmutableCell } from "@nteract/commutable/src"; import { actions, AppState, ContentRef, selectors } from "@nteract/core"; import { MarkdownPreviewer } from "@nteract/markdown"; import { defineConfigOption } from "@nteract/mythic-configuration"; -import { Source } from "@nteract/presentational-components"; +import { Source as BareSource } from "@nteract/presentational-components"; import Editor, { EditorSlots } from "@nteract/stateful-components/lib/inputs/editor"; import React from "react"; import { ReactMarkdownProps } from "react-markdown"; import { connect } from "react-redux"; import { Dispatch } from "redux"; +import styled from "styled-components"; const { selector: markdownConfig } = defineConfigOption({ key: "markdownOptions", @@ -46,6 +47,12 @@ interface DispatchProps { unfocusEditor: () => void; } +// Add missing style to make the editor show https://github.com/nteract/nteract/commit/7fa580011578350e56deac81359f6294fdfcad20#diff-07829a1908e4bf98d4420f868a1c6f890b95d77297b9805c9590d2dba11e80ce +export const Source = styled(BareSource)` + width: 100%; + width: -webkit-fill-available; + width: -moz-available; +`; export class PureMarkdownCell extends React.Component { render() { const { contentRef, id, cell, children } = this.props;