Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added an optional height and overflow scrollbar for the Markdown Component #8528

Merged
merged 20 commits into from
Jun 19, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion demo/markdown_example/run.ipynb
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"cells": [{"cell_type": "markdown", "id": "302934307671667531413257853548643485645", "metadata": {}, "source": ["# Gradio Demo: markdown_example"]}, {"cell_type": "code", "execution_count": null, "id": "272996653310673477252411125948039410165", "metadata": {}, "outputs": [], "source": ["!pip install -q gradio "]}, {"cell_type": "code", "execution_count": null, "id": "288918539441861185822528903084949547379", "metadata": {}, "outputs": [], "source": ["import gradio as gr\n", "\n", "css = (\n", " \"footer {display: none !important;} .gradio-container {min-height: 0px !important;}\"\n", ")\n", "\n", "# sample md stolen from https://dillinger.io/\n", "\n", "md = \"\"\"# Dillinger\n", "## _The Last Markdown Editor, Ever_\n", "\n", "This is some `inline code`, it is good.\n", "\n", "[![Build Status](https://travis-ci.org/joemccann/dillinger.svg?branch=master)](https://travis-ci.org/joemccann/dillinger)\n", "\n", "Dillinger is a cloud-enabled, mobile-ready, offline-storage compatible,\n", "AngularJS-powered HTML5 Markdown editor.\n", "\n", "- Type some Markdown on the left\n", "- See HTML in the right\n", "- \u2728Magic \u2728\n", "\n", "## Features\n", "\n", "- Import a HTML file and watch it magically convert to Markdown\n", "- Drag and drop images (requires your Dropbox account be linked)\n", "- Import and save files from GitHub, Dropbox, Google Drive and One Drive\n", "- Drag and drop markdown and HTML files into Dillinger\n", "- Export documents as Markdown, HTML and PDF\n", "\n", "Markdown is a lightweight markup language based on the formatting conventions\n", "that people naturally use in email.\n", "As [John Gruber] writes on the [Markdown site][df1]\n", "\n", "> The overriding design goal for Markdown's\n", "> formatting syntax is to make it as readable\n", "> as possible. The idea is that a\n", "> Markdown-formatted document should be\n", "> publishable as-is, as plain text, without\n", "> looking like it's been marked up with tags\n", "> or formatting instructions.\n", "\n", "This text you see here is *actually- written in Markdown! To get a feel\n", "for Markdown's syntax, type some text into the left window and\n", "watch the results in the right.\n", "\n", "## Tech\n", "\n", "Dillinger uses a number of open source projects to work properly:\n", "\n", "- [AngularJS] - HTML enhanced for web apps!\n", "- [Ace Editor] - awesome web-based text editor\n", "- [markdown-it] - Markdown parser done right. Fast and easy to extend.\n", "- [Twitter Bootstrap] - great UI boilerplate for modern web apps\n", "- [node.js] - evented I/O for the backend\n", "- [Express] - fast node.js network app framework [@tjholowaychuk]\n", "- [Gulp] - the streaming build system\n", "- [Breakdance](https://breakdance.github.io/breakdance/) - HTML\n", "to Markdown converter\n", "- [jQuery] - duh\n", "\n", "And of course Dillinger itself is open source with a [public repository][dill]\n", " on GitHub.\n", "\n", "## Installation\n", "\n", "Dillinger requires [Node.js](https://nodejs.org/) v10+ to run.\n", "\n", "Install the dependencies and devDependencies and start the server.\n", "\n", "```bash\n", "cd dillinger\n", "npm i\n", "node app\n", "```\n", "\n", "For production environments...\n", "\n", "```bash\n", "npm install --production\n", "NODE_ENV=production node app\n", "```\n", "\n", "## Plugins\n", "\n", "Dillinger is currently extended with the following plugins.\n", "Instructions on how to use them in your own application are linked below.\n", "\n", "| Plugin | README |\n", "| ------ | ------ |\n", "| Dropbox | [plugins/dropbox/README.md][PlDb] |\n", "| GitHub | [plugins/github/README.md][PlGh] |\n", "| Google Drive | [plugins/googledrive/README.md][PlGd] |\n", "| OneDrive | [plugins/onedrive/README.md][PlOd] |\n", "| Medium | [plugins/medium/README.md][PlMe] |\n", "| Google Analytics | [plugins/googleanalytics/README.md][PlGa] |\n", "\n", "## Development\n", "\n", "Want to contribute? Great!\n", "\n", "Dillinger uses Gulp + Webpack for fast developing.\n", "Make a change in your file and instantaneously see your updates!\n", "\n", "Open your favorite Terminal and run these commands.\n", "\n", "First Tab:\n", "\n", "```bash\n", "node app\n", "```\n", "\n", "Second Tab:\n", "\n", "```bash\n", "gulp watch\n", "```\n", "\n", "(optional) Third:\n", "\n", "```bash\n", "karma test\n", "```\n", "\n", "#### Building for source\n", "\n", "For production release:\n", "\n", "```bash\n", "gulp build --prod\n", "```\n", "\n", "Generating pre-built zip archives for distribution:\n", "\n", "```bash\n", "gulp build dist --prod\n", "```\n", "\n", "## Docker\n", "\n", "Dillinger is very easy to install and deploy in a Docker container.\n", "\n", "By default, the Docker will expose port 8080, so change this within the\n", "Dockerfile if necessary. When ready, simply use the Dockerfile to\n", "build the image.\n", "\n", "```bash\n", "cd dillinger\n", "docker build -t <youruser>/dillinger:${package.json.version} .\n", "```\n", "\n", "This will create the dillinger image and pull in the necessary dependencies.\n", "Be sure to swap out `${package.json.version}` with the actual\n", "version of Dillinger.\n", "\n", "Once done, run the Docker image and map the port to whatever you wish on\n", "your host. In this example, we simply map port 8000 of the host to\n", "port 8080 of the Docker (or whatever port was exposed in the Dockerfile):\n", "\n", "```bash\n", "docker run -d -p 8000:8080 --restart=always --cap-add=SYS_ADMIN --name=dillinger <youruser>/dillinger:${package.json.version}\n", "```\n", "\n", "> Note: `--capt-add=SYS-ADMIN` is required for PDF rendering.\n", "\n", "Verify the deployment by navigating to your server address in\n", "your preferred browser.\n", "\n", "```bash\n", "127.0.0.1:8000\n", "```\n", "\n", "```python\n", "import gradio as gr\n", "\n", "gr.Blocks() as demo:\n", " gr.Markdown(value=md)\n", "\n", "demo.launch()\n", "```\n", "\n", "```js\n", "function fancyAlert(arg) {\n", " if(arg) {\n", " $.facebox({div:'#foo'})\n", " }\n", "}\n", "```\n", "\n", "## License\n", "\n", "MIT\n", "\n", "**Free Software, Hell Yeah!**\n", "\n", "[//]: # (These are reference links used in the body of this note and get stripped out when the markdown processor does its job. There is no need to format nicely because it shouldn't be seen. Thanks SO - http://stackoverflow.com/questions/4823468/store-comments-in-markdown-syntax)\n", "\n", " [dill]: <https://github.com/joemccann/dillinger>\n", " [git-repo-url]: <https://github.com/joemccann/dillinger.git>\n", " [john gruber]: <http://daringfireball.net>\n", " [df1]: <http://daringfireball.net/projects/markdown/>\n", " [markdown-it]: <https://github.com/markdown-it/markdown-it>\n", " [Ace Editor]: <http://ace.ajax.org>\n", " [node.js]: <http://nodejs.org>\n", " [Twitter Bootstrap]: <http://twitter.github.com/bootstrap/>\n", " [jQuery]: <http://jquery.com>\n", " [@tjholowaychuk]: <http://twitter.com/tjholowaychuk>\n", " [express]: <http://expressjs.com>\n", " [AngularJS]: <http://angularjs.org>\n", " [Gulp]: <http://gulpjs.com>\n", "\n", " [PlDb]: <https://github.com/joemccann/dillinger/tree/master/plugins/dropbox/README.md>\n", " [PlGh]: <https://github.com/joemccann/dillinger/tree/master/plugins/github/README.md>\n", " [PlGd]: <https://github.com/joemccann/dillinger/tree/master/plugins/googledrive/README.md>\n", " [PlOd]: <https://github.com/joemccann/dillinger/tree/master/plugins/onedrive/README.md>\n", " [PlMe]: <https://github.com/joemccann/dillinger/tree/master/plugins/medium/README.md>\n", " [PlGa]: <https://github.com/RahulHP/dillinger/blob/master/plugins/googleanalytics/README.md>\n", "\n", "\"\"\"\n", "with gr.Blocks(css=css) as demo:\n", " gr.Markdown(value=md, header_links=True)\n", "\n", "demo.launch()\n"]}], "metadata": {}, "nbformat": 4, "nbformat_minor": 5}
{"cells":[{"cell_type":"markdown","id":"302934307671667531413257853548643485645","metadata":{},"source":["# Gradio Demo: markdown_example"]},{"cell_type":"code","execution_count":null,"id":"272996653310673477252411125948039410165","metadata":{},"outputs":[],"source":["!pip install -q gradio"]},{"cell_type":"code","execution_count":null,"id":"288918539441861185822528903084949547379","metadata":{},"outputs":[],"source":["import gradio as gr\n","\n","css = (\n"," \"footer {display: none !important;} .gradio-container {min-height: 0px !important;}\"\n",")\n","\n","# sample md stolen from https://dillinger.io/\n","\n","md = \"\"\"# Dillinger\n","## _The Last Markdown Editor, Ever_\n","\n","This is some `inline code`, it is good.\n","\n","[![Build Status](https://travis-ci.org/joemccann/dillinger.svg?branch=master)](https://travis-ci.org/joemccann/dillinger)\n","\n","Dillinger is a cloud-enabled, mobile-ready, offline-storage compatible,\n","AngularJS-powered HTML5 Markdown editor.\n","\n","- Type some Markdown on the left\n","- See HTML in the right\n","- ✨Magic ✨\n","\n","## Features\n","\n","- Import a HTML file and watch it magically convert to Markdown\n","- Drag and drop images (requires your Dropbox account be linked)\n","- Import and save files from GitHub, Dropbox, Google Drive and One Drive\n","- Drag and drop markdown and HTML files into Dillinger\n","- Export documents as Markdown, HTML and PDF\n","\n","Markdown is a lightweight markup language based on the formatting conventions\n","that people naturally use in email.\n","As [John Gruber] writes on the [Markdown site][df1]\n","\n","> The overriding design goal for Markdown's\n","> formatting syntax is to make it as readable\n","> as possible. The idea is that a\n","> Markdown-formatted document should be\n","> publishable as-is, as plain text, without\n","> looking like it's been marked up with tags\n","> or formatting instructions.\n","\n","This text you see here is *actually- written in Markdown! To get a feel\n","for Markdown's syntax, type some text into the left window and\n","watch the results in the right.\n","\n","## Tech\n","\n","Dillinger uses a number of open source projects to work properly:\n","\n","- [AngularJS] - HTML enhanced for web apps!\n","- [Ace Editor] - awesome web-based text editor\n","- [markdown-it] - Markdown parser done right. Fast and easy to extend.\n","- [Twitter Bootstrap] - great UI boilerplate for modern web apps\n","- [node.js] - evented I/O for the backend\n","- [Express] - fast node.js network app framework [@tjholowaychuk]\n","- [Gulp] - the streaming build system\n","- [Breakdance](https://breakdance.github.io/breakdance/) - HTML\n","to Markdown converter\n","- [jQuery] - duh\n","\n","And of course Dillinger itself is open source with a [public repository][dill]\n"," on GitHub.\n","\n","## Installation\n","\n","Dillinger requires [Node.js](https://nodejs.org/) v10+ to run.\n","\n","Install the dependencies and devDependencies and start the server.\n","\n","```bash\n","cd dillinger\n","npm i\n","node app\n","```\n","\n","For production environments...\n","\n","```bash\n","npm install --production\n","NODE_ENV=production node app\n","```\n","\n","## Plugins\n","\n","Dillinger is currently extended with the following plugins.\n","Instructions on how to use them in your own application are linked below.\n","\n","| Plugin | README |\n","| ------ | ------ |\n","| Dropbox | [plugins/dropbox/README.md][PlDb] |\n","| GitHub | [plugins/github/README.md][PlGh] |\n","| Google Drive | [plugins/googledrive/README.md][PlGd] |\n","| OneDrive | [plugins/onedrive/README.md][PlOd] |\n","| Medium | [plugins/medium/README.md][PlMe] |\n","| Google Analytics | [plugins/googleanalytics/README.md][PlGa] |\n","\n","## Development\n","\n","Want to contribute? Great!\n","\n","Dillinger uses Gulp + Webpack for fast developing.\n","Make a change in your file and instantaneously see your updates!\n","\n","Open your favorite Terminal and run these commands.\n","\n","First Tab:\n","\n","```bash\n","node app\n","```\n","\n","Second Tab:\n","\n","```bash\n","gulp watch\n","```\n","\n","(optional) Third:\n","\n","```bash\n","karma test\n","```\n","\n","#### Building for source\n","\n","For production release:\n","\n","```bash\n","gulp build --prod\n","```\n","\n","Generating pre-built zip archives for distribution:\n","\n","```bash\n","gulp build dist --prod\n","```\n","\n","## Docker\n","\n","Dillinger is very easy to install and deploy in a Docker container.\n","\n","By default, the Docker will expose port 8080, so change this within the\n","Dockerfile if necessary. When ready, simply use the Dockerfile to\n","build the image.\n","\n","```bash\n","cd dillinger\n","docker build -t <youruser>/dillinger:${package.json.version} .\n","```\n","\n","This will create the dillinger image and pull in the necessary dependencies.\n","Be sure to swap out `${package.json.version}` with the actual\n","version of Dillinger.\n","\n","Once done, run the Docker image and map the port to whatever you wish on\n","your host. In this example, we simply map port 8000 of the host to\n","port 8080 of the Docker (or whatever port was exposed in the Dockerfile):\n","\n","```bash\n","docker run -d -p 8000:8080 --restart=always --cap-add=SYS_ADMIN --name=dillinger <youruser>/dillinger:${package.json.version}\n","```\n","\n","> Note: `--capt-add=SYS-ADMIN` is required for PDF rendering.\n","\n","Verify the deployment by navigating to your server address in\n","your preferred browser.\n","\n","```bash\n","127.0.0.1:8000\n","```\n","\n","```python\n","import gradio as gr\n","\n","gr.Blocks() as demo:\n"," gr.Markdown(value=md)\n","\n","demo.launch()\n","```\n","\n","```js\n","function fancyAlert(arg) {\n"," if(arg) {\n"," $.facebox({div:'#foo'})\n"," }\n","}\n","```\n","\n","## License\n","\n","MIT\n","\n","**Free Software, Hell Yeah!**\n","\n","[//]: # (These are reference links used in the body of this note and get stripped out when the markdown processor does its job. There is no need to format nicely because it shouldn't be seen. Thanks SO - http://stackoverflow.com/questions/4823468/store-comments-in-markdown-syntax)\n","\n"," [dill]: <https://github.com/joemccann/dillinger>\n"," [git-repo-url]: <https://github.com/joemccann/dillinger.git>\n"," [john gruber]: <http://daringfireball.net>\n"," [df1]: <http://daringfireball.net/projects/markdown/>\n"," [markdown-it]: <https://github.com/markdown-it/markdown-it>\n"," [Ace Editor]: <http://ace.ajax.org>\n"," [node.js]: <http://nodejs.org>\n"," [Twitter Bootstrap]: <http://twitter.github.com/bootstrap/>\n"," [jQuery]: <http://jquery.com>\n"," [@tjholowaychuk]: <http://twitter.com/tjholowaychuk>\n"," [express]: <http://expressjs.com>\n"," [AngularJS]: <http://angularjs.org>\n"," [Gulp]: <http://gulpjs.com>\n","\n"," [PlDb]: <https://github.com/joemccann/dillinger/tree/master/plugins/dropbox/README.md>\n"," [PlGh]: <https://github.com/joemccann/dillinger/tree/master/plugins/github/README.md>\n"," [PlGd]: <https://github.com/joemccann/dillinger/tree/master/plugins/googledrive/README.md>\n"," [PlOd]: <https://github.com/joemccann/dillinger/tree/master/plugins/onedrive/README.md>\n"," [PlMe]: <https://github.com/joemccann/dillinger/tree/master/plugins/medium/README.md>\n"," [PlGa]: <https://github.com/RahulHP/dillinger/blob/master/plugins/googleanalytics/README.md>\n","\n","\"\"\"\n","with gr.Blocks(css=css) as demo:\n"," gr.Markdown(value=md, header_links=True, height='400px')\n","\n","demo.launch()\n"]}],"metadata":{"language_info":{"name":"python"}},"nbformat":4,"nbformat_minor":5}
2 changes: 1 addition & 1 deletion demo/markdown_example/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,6 @@

"""
with gr.Blocks(css=css) as demo:
gr.Markdown(value=md, header_links=True)
gr.Markdown(value=md, header_links=True, height='400px')

demo.launch()
3 changes: 3 additions & 0 deletions gradio/components/markdown.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ def __init__(
sanitize_html: bool = True,
line_breaks: bool = False,
header_links: bool = False,
height: str | None = None,
):
"""
Parameters:
Expand All @@ -57,6 +58,7 @@ def __init__(
sanitize_html: If False, will disable HTML sanitization when converted from markdown. This is not recommended, as it can lead to security vulnerabilities.
line_breaks: If True, will enable Github-flavored Markdown line breaks in chatbot messages. If False (default), single new lines will be ignored.
header_links: If True, will automatically create anchors for headings, displaying a link icon on hover.
height: An optional string that specifies the maximum height of this component in CSS units (e.g., '200px'), beyond which a scrollbar is added. Can be used for controlling the display size of this component.
"""
self.rtl = rtl
if latex_delimiters is None:
Expand All @@ -65,6 +67,7 @@ def __init__(
self.sanitize_html = sanitize_html
self.line_breaks = line_breaks
self.header_links = header_links
self.height = height

super().__init__(
label=label,
Expand Down
3 changes: 3 additions & 0 deletions js/markdown/Example.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
right: string;
display: boolean;
}[];

export let height: string;
</script>

<div
Expand All @@ -25,6 +27,7 @@
{sanitize_html}
{line_breaks}
chatbot={false}
{height}
/>
</div>

Expand Down
2 changes: 2 additions & 0 deletions js/markdown/Index.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
display: boolean;
}[];
export let header_links = false;
export let height: string;

$: label, gradio.dispatch("change");
</script>
Expand Down Expand Up @@ -61,6 +62,7 @@
{sanitize_html}
{line_breaks}
{header_links}
{height}
/>
</div>
</Block>
Expand Down
3 changes: 3 additions & 0 deletions js/markdown/shared/Markdown.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
display: boolean;
}[];
export let header_links = false;
export let height: string;

const dispatch = createEventDispatcher<{ change: undefined }>();

Expand All @@ -30,6 +31,7 @@
data-testid="markdown"
dir={rtl ? "rtl" : "ltr"}
use:copy
style="max-height: {height}; overflow-y: auto;"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I feel like this style should only be applied if the height is not null

Copy link
Contributor Author

@ShruAgarwal ShruAgarwal Jun 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have made suggested changes and would request you to review and share your thoughts! :)

>
<MarkdownCode
message={value}
Expand All @@ -38,6 +40,7 @@
{line_breaks}
chatbot={false}
{header_links}
{height}
/>
</div>

Expand Down
9 changes: 8 additions & 1 deletion js/markdown/shared/MarkdownCode.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
export let render_markdown = true;
export let line_breaks = true;
export let header_links = false;
export let height: string;

let el: HTMLSpanElement;
let html: string;
Expand Down Expand Up @@ -76,7 +77,13 @@
afterUpdate(() => render_html(message));
</script>

<span class:chatbot bind:this={el} class="md" class:prose={render_markdown}>
<span
class:chatbot
bind:this={el}
class="md"
class:prose={render_markdown}
style="max-height: {height}; overflow-y: auto;"
>
{#if render_markdown}
{@html html}
{:else}
Expand Down